remove merge lines (<<<, >>>, ===)