Fixed Conflicts.  KEY PICKUP BROKE THO.

I suck with git. There were some conflicts with some or the scripts. I
fixed them. Everything seems to work in order with this commit, besides
keyPickup...