commit merge conflict