remove prefs
Resolve merge conflicts
Merge branch 'sowmyasb-develop' into develop