[opensuse-buildservice] Conflict in branch