Added Attack All functionality
Fixed merge conflicts