add stars for rating view
resolve conflicts