An spanish contribution
fix merge conflict