Fixing broken merge

Hey, 

It looks like a merge was committed with the conflict comments in place

Thanks