Resolve "Merge errors"

Closes #20 (closed)

Edited by Kristina Hoeppner

Merge request reports

Loading