new diary
merge the files