attacks fixed
Merge