Sincronia com upstream, conf
Resolvendo conflitos no sync com upstream