Fix mergetool corruption
refs #858