fixed dice rolls
fixed conflicts