Case 6
merger
Resolviendo conflictos