Feature resolve conflicts#48

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

feature-resolve-conflictsTaskarCenterAtUW/TDEI-python-osw-validation:feature-resolve-conflictsCopy head branch name to clipboard