commit merge conflict maker