Removing conflicting mapping