change temperature vancouver
modify temperature vancouver from master
fixed merge conflicts