conflict resolve
Merge pull request #25 from davinashreddy/ui-version-update

conflict resolve