When was the border disputes settled between the US and Mexico?