Remove CLogView2
Resolved merge conflicts