removing merge bug; follow our points-counting model