conflict resolution went wrong.