fixed conflicts in migrations and create the database