I also got bit by this bug. For me the '*.Conflict.Conflict' or '*.Conflict1' '*.Conflict2' folders were empty, so I had to find and delete those, then rename the '*.Conflict' folders to remove the '.Conflict' extension. It seemed to be _mostly_ all directories that were affected, not files. I used (Linux): find . -type d -name '*.Conflict.Conflict' -exec rm -r '{}' \;find . -type d -name '*.Conflict' -exec rename 's/\.Conflict$//' '{}' \;CAUTION: notice the 'rm -r' in the first command....make sure those directories are empty first!! Run the commands without the '-exec' part first just to make sure you're finding the correct directories. The 'rename' command might be called 'perl-rename' depending on your system. Scott