EZP-22152: removed a conflict marker

The beer's on me