changed to spanish
fixed a merge on line 69