fix bug

@@ -15,7 +15,7 @@ var lazyLoad = require('yoho-jquery-lazyload');
 var yas = require('../common/data-yas');
 var dataLazyLoad = require('../plugins/lazy-load')(document);
 var setPager = require('./detail/pager');
-var notify = require('./detail.notify');
+var notify = require('./detail/notify');
 
 var bindEvent = $.Callbacks();                         // eslint-disable-line
 var clickAcquireCouponEvent = $.Callbacks('unique');   // eslint-disable-line
@@ -55,11 +55,8 @@ var dialogTpl = require('hbs/product/coupon-dialog.hbs');
 var pkgData;// 套餐数据
 var notifyTpl = require('hbs/product/notify.hbs');
 
-<<<<<<< HEAD
 var $goodsIdArr = [];
 
-=======
->>>>>>> origin/feature/new-product-detail
 function limitedProductUrl(s) {
     return window.location.href + '?openby:yohobuy={"action":"go.limitpurchase","params":{"lp":"' + s + '"}}';
 }