managing conflicts in updates in bayou 8313288