The "Trash" folder in the File Manager will now offer the option to overwrite existing files if they conflict with the restore path (move them to the trash). For Enhanced, this only applies to the multi-select "restore" button where The per-file option will always have overwrite=yes (again, if a conflict, it will move the conflict to the trash). The Evolution skin will have a popup for both. In the event that ovewrite is not selected and there is a conflict, previously any conflict (eg: index.php) would be renamed to index.php.1 However, this is not great, as a .1 file may show it's plain-text, which is insecure. For any "text" file, a file which has an "edit" icon next to it, they will be restored to index.1.php where the incremental number is set before the extension. Everything else which is in conflict will still use the "file.zip.1" method.