add google map api
resolve conflict