class Person
merge resolved