Fixing Discussion form text field that breaks
Fixing path problem on Nurani_profile
resolving conflicts