[opensuse-kernel] help needed to fix conflict in file series.conf