Rename the merge thing to make it clear that it's a merge driver