mergeTool revamp now works when called from PyreconMainWindow