Update of planOfAttack
Merge conflict