Just a merge artifact. Fixed now.