Fix conflict merge problem

I must have messed up the merge.