fix to merge riverfly score correctly. tidying