fixed merge conflict
merging
Fixed reviews bug