Resolve the conflict (take out the has been methods)