score update
merge