sekhar- list of users added
sekhar- conflicts resolved