remove preload from conflict
remove preload from conflict

that's dependent on another commit

sfu/canvas-lms,sfu/canvas-lms,sfu/canvas-lms,djbender/canvas-lms,djbender/canvas-lms,sfu/canvas-lms,sfu/canvas-lms,djbender/canvas-lms,djbender/canvas-lms,sfu/canvas-lms,sfu/canvas-lms