bugfixes, specifically merge order and score