Merge conflict in server.tex