Backing up conflicting files