Updating diff tool and merge tool to webstorm