when the texas revolution began, the united states eventually inherited a border conflict with mexico, leading to the mexican-american war