Prevention better than cure, haha, that's exactly why weave ships an MCP server alongside the merge driver.