fixed high scores problem
fixed conflicts