Resolve conflicts
Create owners model and migrate
Delete migration