merge ariel and jb's notebooks