Fix the merge

Closed Whitney Armstrong requested to merge whit/NPDet:jihee into master

Not sure why this didn't work before.

Merge request reports