Various conflicts in updates