Sort out conflicts.