Remove conflicting features