added Ottawa
fixed conflicts