Code-Meshing Meets Teaching the Conflicts-edited-1