User/Person models merge