show conflicts in a nice way
Merge branch 'master' of github.com:kurzy/noise-to-opportunity-ml
fix error in overview