The merge proposal https://code.launchpad.net/~smartgpx/bzr-explorer/fix-519757/+merge/18994 has this line in the header: Diff against target: 10 lines (+1/-1) 1 file modified (has conflicts) It seems like pretty new feature? What it means? There is actually only 1 line modified and no conflicts. Why it tells about conflicts?