Fix do conflito de commits.