fix bug with person service
fix merge issue