Adding combat to ai merge