pegando o push
resolvendo conflitos