Adding conflictstyle.