remove merge/conflict lines

You probably have this removed already, but if not - here you go :)