solve merge conflict

Closed Manuel Schrauth requested to merge 150-dumba into master

Closes #150 (closed)

Merge request reports