More 'corrupt' re-commits

PC shut down during commit, 'corrupted' the repo, had to merge file
differences manually