Conflict resolution legacy version, kept for hosting purposes (https://spassvogel.github.io/conflictresolution/)