remove left over merge conflict stuff