Resolvendo conflito de commit no GIT