merging notebooks and touchup