create BaseModel
fix BaseModel inheritance
merge conflicts
merge