Fix Google Maps
Fix conflict