use conflictstyle = diff3 for easier merging in git