added illustrations
fixed conflicts