completed migration and models for tag
merge conflicts resolved