remove merge line