first notes
conflict resolved in carousel.js