Fix conflict

Merged Fabian Nuraddin Alexander Gabel requested to merge fix-conflict into master

Merge request reports