fixed merge error... thought i had it that time

Thought i got the merge error there, clearly not, i really wanted to
figure it out though darn