Bad conflict resolution