solving google maps bootstrap confilct
automated commit