fixed the name difference problem caused by the bad rebase