corrected some merge errors

some changes were merged into nirvana, caused the enemy to walk in the
air.