Solucionado merge conflicts