case study text update
fixed conflicts