Add condation
Merge branch 'development' of github.com:sonam-clarion/rails-inhouse-project-clarion into development