resolucion and loading image
solving merge problems