Fix conflicting migrations

Dan R,
Can you please review this?