Add database migration files
Fix merge conflict on question model