changed scoring method
conflict solved