Fixed: build after merge