[14:07] <rindolf> Hi all. How can I resolve the bzr status conflicts ? http://paste.debian.net/789884/