Start adapting within ConflictMarker, as well.