another merge

group,skore