Resolver conflictos (Issue #175)