fixing some left over merge cruft

STAY OUT OF MY BRANCH YOU N00BS I like my code working except for when I
break it. Let me have the privlige of being the only one to ruin my
code!!!!