Correct corrupt files in wrong merge