Modified the user profile xml
added the edit text functionality to the user profile page
Added the bin files which are resolved after the conflict