google api added and stuff
merge confilt