edits to conflict resolution