Pass -c merge.conflictstyle=merge when pulling