test mergetool
test mergetool master
merge master and test