apply: respect merge.conflictStyle in --3way