remove conflicting definition