Validation fix

Harris Ferguson (haf094)requested to merge
validation-fix into master

Fix of the weird conflict stuff that was happening on norahs original merge request

Merge request reports