Merge conflict can't be resolved on the web, pull and merge
Merge conflict can't be resolved on the web, pull and merge