remove merge conflict lines 2nd try