After merging my google drive changes