Updating from Xorg 6.9 to Xorg 7.2

[Jose Antonio Galache]

Hi all,
I'm updating the Xorg from 6.9 to 7.2 in freebsd 6.2 Releas and when I 
was in the last step, when running mergebase.sh script, I have been 
displayed the following message:

Files that exist both in /usr/local and /usr/X11R6 have been found as 
shown above. Merging will not continue.
While some such files are safe to remove as they will be regenerated 
(like /usr/X11R6/man/whatis), some you might want to move away somewhere 
safe, and some might point to conflicts in ports.
For this script to continue, you need to either move these files away 
from /usr/X11R6 or delete them. If you don't know what to do about a 
particular file, ask on x11 at FreeBSD.org mailing list.
The list is saved in /tmp/mergebase.qo7TBWmH 

Looking at the list in the /tmp/mergebase.qo7TBWmH file, too many files 
are included (877 files) within bin, etc, include, lib, man and share 
folders. Have I to remove them manually? or is it another way to do it 
in an automated way?. Thanks a lot in advance for your help.

Regards,
Jose.