Fix rebase conflict mistake