added score counter
fixed conflicts