added enemy
merge