Fixing Conflict

diff --cc js/foundation/foundation.clearing.js
index f1c41badee525cae640cab054da469a8f1a66b7c,58ea17ae74a6f272ce9f7be14fc701dfb2f61999..505534fa1da975b0ea3fadb50e3606ac31cc3c96
--- 1/js/foundation/foundation.clearing.js
--- 2/js/foundation/foundation.clearing.js
+++ b/js/foundation/foundation.clearing.js
@@@ -163,12 -154,11 +163,12 @@@
      },
  
      open : function ($image, current, target) {
-       var self = this,
++
+       var body = $(document.body),
            root = target.closest('.clearing-assembled'),
-           container = self.S('div', root).first(),
-           visible_image = self.S('.visible-img', container),
-           image = self.S('img', visible_image).not($image),
-           label = self.S('.clearing-touch-label', container);
+           container = $('div', root).first(),
+           visible_image = $('.visible-img', container),
+           image = $('img', visible_image).not($image);
  
        if (!this.locked()) {
          // set the image to the selected thumbnail
@@@ -176,9 -166,10 +176,10 @@@
            .attr('src', this.load($image))
            .css('visibility', 'hidden');
  
 -        this.loaded(image, function () {
 +        this.image_loaded(image, function () {
            image.css('visibility', 'visible');
            // toggle the gallery
+           body.css('overflow', 'hidden');
            root.addClass('clearing-blackout');
            container.addClass('clearing-container');
            visible_image.show();