changes made to select
merge conflicts removed
merge conflict
Merge branch 'master' of github.com:anbublacky/nthat
Merge branch 'master' of github.com:anbublacky/nthat
alingment made