[opensuse-packaging] Fixing file conflicts