mergetool: simplify conditionals