Update the merge scripts for the big git rename.