Fixed Profile Info
conflict fix
Merge branch 'petprofile3'