Fix conflict after merge

Signed-off-by: Emilien Kenler <hello@emilienkenler.com>
Change migration order

Signed-off-by: Emilien Kenler <hello@emilienkenler.com>