[psidnell]

I've managed to get myself into a situation where my plan won't publish (I have updated) because of conflicts, but it doesn't display any conflicts so I can't resolve them :-(