Resolve "Solve postmerge conflicts"

Erik Nixdorfrequested to merge
14-solve-postmerge-conflicts into master

Closes #14 (closed) #7 (closed)

Edited by Erik Nixdorf

Merge request reports