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

I have manually merged. Continue