working on star rating on reviews new
resolving merge conflict
Merge branch 'stylestwo'