Z:sharelatex--continue github merge/en

I have manually merged. Continue