resolver conflictos

kasdjadsjfshsfgdj