Got it to actually work
Merge remote-tracking branch 'origin/dem-waffles'