Working on making the enemy take damage
Fixed a merge conflict