Fix broken merge

There was an extra block I missed when I was doing the merge