add merge conflictstyle