* fix: resolve conflict

* chg: use bor url for import

* Fix regressions from merge

Co-authored-by: Jaynti Kanani <jdkanani@gmail.com>