test commit merge conflict test