finished attacker rushing and swarm
merging