if you thought our project was bad before, wait 'til you see how I royally fuck it up today
fix merge conflict payload.rb