semi-working board
fixed conflicts