fixed merge conflict in score emit