Resolve conflict#50

sujata-m merged 5 commits intodevTaskarCenterAtUW/TDEI-python-osw-validation:devfrom

feature-resolve-main-conflictTaskarCenterAtUW/TDEI-python-osw-validation:feature-resolve-main-conflictCopy head branch name to clipboard