Fix merge stash poop.. NFC how I managed this.
Fix merge stash poop.. NFC how I managed this.

tedconf/crushinator_helpers,tedconf/crushinator_helpers,tedconf/crushinator_helpers,tedconf/crushinator_helpers