deleted files that were accidentally kept after the last merge