enemy wave spawnable
fixed merge errors