<<<<<<< HEAD ======= >>>>>>> origin/note-redux <<<<<<< HEAD ======= >>>>>>> origin/note-redux