This is the name of the conflict between the u.s. and the country along its southern border (1846 to 1848).