added Person to admin
Fixing merge conflict