test commit checking to see merge conflict behavior