add base class
resolve conflict