merge diary add and diary edit