fix api key for google maps
fix merge conflicts