Code review comment for lp://qastaging/~indicator-applet-developers/indicator-messages/consolidate

> Thanks Pete, there is a merge conflict in src/im-desktop-menu.c there though.
> Would it also be possible to have the previous branch re-used? e.g show the
> fix as a different commit, would make things easier to review

Hi Sebastien, I thought I did reuse the existing branch? (lp:~indicator-applet-developers/indicator-messages/consolidate)

I've fixed the merge-conflict now, too.