validation added
conflict removed
Merge branch 'master' of github.com:neeraji2it/SMO