Fixed rebase conflict mistake