check conflict

remove conflict
conflict has been resolved

conflict has been resovled