Resolved conflict in Person