slightly change
solve merge conflict
change google map to v2