Google Places merged
merge conflict solved