added score
Fixing conflicts