Return accidentally lost "Merge all" label

Gone conflict resolution message only.
Merge branch 'return-merge-all-label'

Return accidentally lost "Merge all" (from message only) conflict
resolution message.