Combined migrations into 1 migration

Modified a migration such that it should not cause issues on Travis or QA