fixed the conflicts at views/assets.js