Hello. Yesterday i use mergemaster -F option after installworld. Worked good for me. All files that differ only by cvs tag were replaced. I update from 8.0-CURRENT-200902 to head sources. Thanks. -- best regards, cenix.