resolved some merge conflict validation errors
Merge branch 'master' of github.com:Siyavula/ukuqonda-html