add code to merge one user with another
Add deleting person rows in merge
Merge branch 'c4c.staging' into c4c.dev