model setup
merge conflict resolution