added score handler
fixed merge conflict