Add git merge.conflictstyle setting