commit to produce conflict
create conflict
conflict MERGED