merge conflicts with diff3 format