Fix merge conflict that I forgot to fix before.