Answer this question.

The 1848 Treaty of Guadalupe Hidalgo officially ended what 2 year long war?
mexican american war