removed mergetool remnant, dan.