Fixed a missed merge marker
Fixed something I stuffed up in the merge...