rerere: fix for merge.conflictstyle