Fixed merge conflict with reviews and votes
[Pam, Rachel] added users to study reviews