resolvendo conflitos merge