fixes merge conflict

diff --cc gulpfile.js
Simple merge

diff --cc test/visual/pages/inliner-bugs.html
index bdf0fb55df06cbb07ee2bfa000ae0ec896437ef8,207ee5e85886e093ee26d9bdc61878e7febb90ff..0a113ce06480f938fe249f366c98f5b475616695
--- 1/test/visual/pages/inliner-bugs.html
--- 2/test/visual/pages/inliner-bugs.html
+++ b/test/visual/pages/inliner-bugs.html
@@@ -4,8 -4,8 +4,9 @@@
  
        #417 - 2 sets of angle backets: outer set should not get converted to charachter codes. you should not see 2 angle brackets here:
        <br>
-       <raw><<LCG Program\TG LCG Coupon Code Default='246996'>></raw>
-       confirmed on inliner (both) need to
++
+       <!-- <raw><<LCG Program\TG LCG Coupon Code Default='246996'>></raw>
 -      confirmed on inliner (both) need to  -->
++      confirmed on inliner (both) need to -->
  
        <hr>
  
@@@ -97,4 -97,3 +98,4 @@@
      </columns>
    </row>
  </container>
-  -->
++