Fix migrations after merging in missing migrations