move city out to var
move city out to var, fix merge