Deleting files from a bad merge