Z:sharelatex--github merge failed/en-gb

Your changes in __appName__ and GitHub could not be automatically merged. Please manually merge the __sharelatex_branch__ branch into the __master_branch__ branch in git. Click below to continue, after you have manually merged.