diffmerge volume fix