Fixing corrupt files from conflicts