INT-2995 Fix Leftover Docbook Conflict Marker