Fixing validation errors
Fixing validation errors
fix merge conflict #845
Merge pull request #853 from mollybostic/master_local

fix merge conflict #845