Add plugins: CVSconflict and Recover
Remove CVSconflict