Fix merge markers

Reinhard Reschrequested to merge
fix-merge into develop

This branch removes markers from a previous merge.

Merge request reports