Fix merge conflict that was missed.