conflict visualization
tutorial
..
Merge https://github.com/cambDI/camb into isidro_dev