build: fix the mess done by merge