fix digest rebase conflict