updated code of tipds
conflict removed
chnagesw
bundle install
bundle
conflict removed
changes
changes in role model
changes in role model