ignore highscore merge conflicts