see if there is a conflict
commit resolved conflict