merging
solving application.js merge conflicts