adding automatic conflict resolution settings UI
Merge branch 'automatic-conflict-resolution' into new3