Restore files from the over-zealous merge