Resolve merge conflicts

diff --cc js/foundation.dropdown.js
index 851c64614761d1db27dfd27f97f6b15818751046,5e913fb44857950f735ba16f9f3eb9f00775ae0e..ae54feccca02199bde6e2a1be5f4b47e555cd272
--- 1/js/foundation.dropdown.js
--- 2/js/foundation.dropdown.js
+++ b/js/foundation.dropdown.js
@@@ -135,18 -133,11 +138,9 @@@ class Dropdown 
          param = (direction === 'top') ? 'height' : 'width',
          offset = (param === 'height') ? this.options.vOffset : this.options.hOffset;
  
 -
 -
 -    if(($eleDims.width >= $eleDims.windowDims.width) || (!this.counter && !Foundation.Box.ImNotTouchingYou(this.$element))){
 +    if(($eleDims.width >= $eleDims.windowDims.width) || (!this.counter && !Foundation.Box.ImNotTouchingYou(this.$element, this.$parent))){
-       var newWidth = $eleDims.windowDims.width,
-           newHOffset = 0;
-       if(this.$parent) {
-         var $parentDims = Foundation.Box.GetDimensions(this.$parent);
-         newHOffset = $parentDims.offset.left;
-         if($parentDims.width < newWidth){
-           newWidth = $parentDims.width;
-         }
-       }
-       this.$element.offset(Foundation.Box.GetOffsets(this.$element, this.$anchor, 'center bottom', this.options.vOffset, this.options.hOffset + newHOffset, true)).css({
-         'width': newWidth - (this.options.hOffset * 2),
+       this.$element.offset(Foundation.Box.GetOffsets(this.$element, this.$anchor, 'center bottom', this.options.vOffset, this.options.hOffset, true)).css({
+         'width': $eleDims.windowDims.width - (this.options.hOffset * 2),
          'height': 'auto'
        });
        this.classChanged = true;
@@@ -155,7 -146,7 +149,7 @@@
  
      this.$element.offset(Foundation.Box.GetOffsets(this.$element, this.$anchor, position, this.options.vOffset, this.options.hOffset));
  
-     while(!Foundation.Box.ImNotTouchingYou(this.$element, this.$parent) && this.counter){
 -    while(!Foundation.Box.ImNotTouchingYou(this.$element, false, true) && this.counter){
++    while(!Foundation.Box.ImNotTouchingYou(this.$element, this.$parent, true) && this.counter){
        this._reposition(position);
        this._setPosition();
      }