When did the centuries-long rivalry between the English and the French end? Why did it end, and how did they easily become close allies since WWI?