resolved conflict in yast2-packager.spec