requirejs
merge conflicts