Remove conflicting mapping