Fix handling of conflicts.