Get ready for production
Fix migrations conflict
Change migration order