During a minor upgrade from 11.1 to 11.2 a file merge failed for /etc/ssh/sshd_config. During the edit of this file, I didn't pay attention to the upgrade adding the following lines. "<<<<<<< current version" and ">>>>>>> 11.2-RELEASE" both these lines caused a syntax error after a reboot and ssh wasn't loaded. Can someone explain the reason for adding lines during an upgrade that will cause a critical service to fail?