--- kdebase-3.3.2/libkonq/konq_iconviewwidget.cc.fix_rename_file_into_mdk_merge	2005-01-25 10:54:50.000000000 +0100
+++ kdebase-3.3.2/libkonq/konq_iconviewwidget.cc	2005-01-25 18:06:17.900688319 +0100
@@ -497,7 +497,17 @@ void KonqIconViewWidget::slotItemRenamed
         // Actually attempt the rename. If it succeeds, KDirLister will update the name.
         KURL oldurl( fileItem->url() );
         KURL newurl( url() );
-        newurl.setPath( url().path(1) + KIO::encodeFileName( name ) );
+        //rename into specific directory
+        kdDebug(1203)<<"oldurl.isLocalFile() :"<<oldurl.isLocalFile()<<" fileItem->url().directory() :"<<fileItem->url().directory()<<" KStandardDirs::mandrake_merge_directory() :"<<KStandardDirs::mandrake_merge_directory()<<endl;
+        if( oldurl.isLocalFile() && (QString(fileItem->url().directory() +"/")==KStandardDirs::mandrake_merge_directory()))
+        {
+            //newurl = KURL(KStandardDirs::mandrake_merge_directory()+"/");
+            newurl.setPath(KStandardDirs::mandrake_merge_directory() + KIO::encodeFileName( name ) );
+        }
+        else
+        {
+            newurl.setPath( url().path(1) + KIO::encodeFileName( name ) );
+        }
         kdDebug(1203)<<" newurl :"<<newurl.url()<<endl;
         // We use url()+name so that it also works if the name is a relative path (#51176)
         KonqOperations::rename( this, oldurl, newurl );