added user update capability
fixed merge conflict