Change merge tool from opendiff to diffuse
Set merge conflictstyle to diff3