Fixed merge conflict
Working on google api