Fixed bad manual merge.
Fixed my bug in Stanford message import.