Resolved merge conflict in ModelValidationResult