built an example case study page
fixing conflicts