envsetup: fix build error and bad merge