Updates to support person merge syncs
Redo migrations after merging