work on high scores
resolve merge conflicts