Fix error after merge (#2)

* merge fixup

* fix some bugs, disable some ci pipelines

Author: nathanwhit