WIP: testing on windows
WIP: overwrite mergeTool save button