fix problems after merge

Merged Praetorius, Simon requested to merge issue/fix_merge_errors into master

Merge request reports