unnecessary file deleted,
corrected a merge that went all wrong about the files to consider