tools: Fix apparent merge failure