The City of Millbrae and California High-Speed Rail Authority have resolved a dispute that could have blocked the project from building stations in the area.