add client api
auth and get calender
update views
solve conflict
solve conflict