resolve conflicts with new weapons