GUACAMOLE-1833: Clean up merge conflict markers in source.

[jmuehlner]

No description provided.

[mike-jumper]

The error failing the PR check does not appear related to these changes, but rather something external affecting the behavior of Sphinx/Python in the Docker build:

...
reading sources... [  3%] adhoc-connections
reading sources... [  6%] administration
reading sources... [  9%] cas-auth
reading sources... [ 12%] configuring-guacamole

Exception occurred:
  File "/usr/local/lib/python3.10/site-packages/sphinx/ext/extlinks.py", line 103, in role
    title = caption % part
TypeError: not all arguments converted during string formatting
The full traceback has been saved in /tmp/sphinx-err-xngx_3j5.log, if you want to report the issue to the developers.
Please also report this if it was a user error, so that a better error message can be provided next time.
A bug report can be filed in the tracker at <https://github.com/sphinx-doc/sphinx/issues>. Thanks!
make: *** [Makefile:47: build/html/index.html] Error 2