fixes mergeconflict

Merged armin requested to merge smallfix into master

Merge request reports