Passage: Most of the fighting ended in continental North America in 1760, although it continued in Europe between France and Britain. The notable exception was the French seizure of St. John's, Newfoundland. General Amherst heard of this surprise action and immediately dispatched troops under his nephew William Amherst, who regained control of Newfoundland after the Battle of Signal Hill in September 1762. Many troops from North America were reassigned to participate in further British actions in the West Indies, including the capture of Spanish Havana when Spain belatedly entered the conflict on the side of France, and a British expedition against French Martinique in 1762 led by Major General Robert Monckton. General Amherst also oversaw the transition of French forts to British control in the western lands. The policies which he introduced in those lands disturbed large numbers of Indians and contributed to Pontiac's Rebellion in 1763. This series of attacks on frontier forts and settlements required the continued deployment of British troops, and it was not resolved until 1766. Question: Who had the major conflict mentioned in the article after the British stopped fighting in North America?
conflict = "France and Britain"
print(conflict)