use a mergetool for conflicts