upload views and migrations
uhh
merge