Fix bad merge
Update server url