added some mergeTool bugs to fix