removed accidental artifact introduced during merge