Remove conflicting tags