Hello Tony, It looks like the Bug 'conflicts duering merge shown as "modified"' is back again with the latest build (today in the morning)... the CVS/Entries file only has 'Result of merge' for the conflicting files. -- Best regards, Richard mailto:r.wirth at wirthware.de