Remove merge error related lines