the conflict was already marked, but these two files were in the wrong PLIST. ok pascal@ (MAINTAINER) sthen@