HIERO BENDE
Af
merge conflict
Merge remote-tracking branch 'origin/detailpage'
Merge branch 'master' of github.com:utwente-di/di10