Which conflict in Asia merged with the European war to become a truly global conflict?