fix data model
fix conflicts
fix conflicts v2