Change done exclusively to generate a merge conflict
resolviendo conflictos
Solucionando conflictos