Remote commit*
resoving conflict