fold duplicate Conflicts: lines, to make newer debuild happy