Can now write reviews
Fixed merge conflicts