Deleted conflict files
Added new CVTool version