Eliminando merge errors