bumped diffmerge script to 0.0.4