cleaning up bad conflict resolution