[horizontal-master] total scores is always odd
fix conflict