merge complete
Merge completed, debugando o resolvedor