correct bad conflict resolution