calendar edit save dragable completed
conflit fixed