remove leftovers of merge conflict