remove merge/conflict lines