build: fix build breakage due to bad merge