updating custom merge driver for dist/