score stuff
fixed conflicts