remove merge conflict stuff