mergeTool(gui) ready for full bug-testing