fixed conflicts
maxpoints loading and fixed conflicts