attackers en blocke

Signed-off-by: unknown <x57757@USMANBUX57757.usma.ds.army.edu>
resolve merge conflicts

Signed-off-by: unknown <x57757@USMANBUX57757.usma.ds.army.edu>