What have I done?
Fixing deleted files conflict