remove left over merge line