Work through entire bad diff set; move some diffs into the all-time diff since it actually doesn't take very long to run
Remove merged file