merge calendar
solve conflict calendar