added Kelowna
fixed conflict