generando api
merging changes