Fix a rebase conflict that accidentally got left in