[Git] Fix failed conflicts for previous commit.