conflicts revision 49180e08afc7cf03413ab108bc71c14e9de1a880
BZR conflict list format 1