add gmaps to users
resolve merge conflicts