Commit c926c513 (amarok) caused a conflict between packages

Hi all, within commit c926c513 been moved "all" Amarok icons from the folder share/apps/amarok/icons to common folder share/icons. This has resulted in a file conflict between other packages. In my case, I noticed conflict on babelfish.png from amarok × konq-plugins (tdeaddons). With this commit was moved to a common folder some icons with too general names, which are very potential source of conflicts. For example: collection.png, dynamic.png, mini_dock.png, random.png, visualizations.png. How to solve it? Rename icons to have the prefix amarok_ (many other icons is named like this)? Move the icons back and into common folder move only necessary icons? Any other ideas? Note: It seems that it will be necessary to check whether not exists some another conflicts. Michele, please could you check conflicts using your local repository of binary packages? Thanks -- Slavek