gcal integ
conflict
solve conf
Merge branch 'gcalinteg'