deleting unneeded git mergeTool file