Updata Diary
merge diary