in process of moving add-person to people view
fixed conflicts