debug fixes and merge conflict

Merge request reports

Loading