Bug 10320: (follow-up) remove stray merge conflict marker