Resolvendo merge.