Conflicts in app/assets/javascripts/socialbyway/core/lib/controller/serviceController.js resolved