git config --global merge.conflictstyle=diff3