Rating fixes
Resolve merge conflict