This should be resolved before merging.  I suspect the line can be deleted.  @pv?