Fix rebase conflict fallout