Improved conflict detection in FileSynchronizer + Tests
Move file to trash when deleting; can be restored during rollback
Mark as deprecated