google person finder
fix merge