merge migration, styling blabla