food and rating view
fixed merge conflict