[#27] Judge Conflicts

Kamile Liucija Vainiuterequested to merge
feat/27-judge-conflicts into main

closes #27

Edited by Fabio Maschi

Merge request reports