solve merge commit confligt from pull from origin