updated diffmerge to 0.0.2