Re: [opensuse-factory] Re: Big conflict oops