Resolvendo merge, definitivo