Machine #1

Just installed [fresh] opensuse 13.2 [from 13.1] two weeks ago.
Was doing updates today thru zypper today.
Zypper listed an error, [file name conflict] . I have never seen this before and was wondering what to do?

Should I have continued? Since I didn't let it continue what should I do now?

I do have the full terminal contents saved if it is needed.

The following was at the end
Code:
Checking for file conflicts: ............................................[error]
Detected 1 file conflict:

File /usr/share/kde4/services/kcm_adobe_flash_player.desktop
  from install of
     flash-player-kde4-11.2.202.425-2.17.1.x86_64(openSUSE-13.2-Update-Non-Oss)
  conflicts with file from package
     flash-plugin-11.2.202.425-release.x86_64(@System)

File conflicts happen when two packages attempt to install files with the same name but different contents. If you continue, conflicting files will be replaced losing the previous content.
Continue? [yes/no] (no): 

Problem occured during or after installation or removal of packages:
Installation aborted by user

Please see the above error message for a hint.
There are some running programs that might use files deleted by recent upgrade. You may wish to check and restart some of them. Run 'zypper ps' to list these programs.
linux-l77p:/home/dabud #