batch delete/move dupes
reup
re-add from.txt

weird git conflict
batch changes