added code for change password functionality
resolved conflicts.