updated user spec
fixed merge conflicts