Don't use strings that are similar to conflict markers in debug msgs
The use of <<<<
and >>>>
in log messages makes it harder to find git merge conflict markers in the code. This PR replaces the offending characters with other separators which preserves usability of the code.