personal prefs added
.gitconfig conflict resolution