reordered this folder
remove diffmerge tool.