merge + pass over notes