Person data layer, admin
resolve conflicts