my commit
saurez_loca change
dpacheco file
fixing conflict