Weird Merge Issue Fix

OddLlama's merge didn't merge correctly, left weirdness. Removed and repushed