conflicts in libraries/base?

[Claus Reinke]

i just tried to bring my ghc repo up to date and got:

== running darcs pull -av --repodir libraries/base
Pulling from "http://darcs.haskell.org/packages/base"...
..
diffing dir...
We have conflicts in the following files:
./Control/Compositor.hs
You have conflicting local changes to:
./Control/Compositor.hs
Proceed? [yn]
Cancelled.

i thought conflicts were a nono for the head repo?

claus