remove merge conflict lines accidentally left in