Added function to resolve fights