fixed bug in getting average rating
fixed merge conflicts