add vancouver
resolve conflict