fixed merge issues with behaviour and enemyspawning scripts