rate onclick
Fix merge conflicts