[Pharo-dev] unexpected merge conflict

Hi, In a fresh Pharo 4 image I want to merge a package (Glamour-Presentations) but I get a merge conflict. Nevertheless, the package from the image has no changes and the package cache is empty. Shouldn't there be no merge conflict in this case? The package is here (its the latest version): MCSmalltalkhubRepository owner: 'Moose' project: 'Glamour' user: '' password: '' Cheers, Andrei