moved jaktSpindel spawn
fixed merge