showing total points
conflict solved