work from 10-17 pablo f and team
merge solved