Calendar event editting WIP
resolved a conflict