added collision detection for enemy/player
conflicts fixed
more conflicts fixed