Mas merge molestoso

Maestra el merge me molesta DX