Testing mergetool
Testing built-in mergetool
Test merge