Fix Merge Derp