merge conflicts on Knowledge