Fix silent rebase conflict in previous PR