fix merge conflict resolution error
fix merge conflict resolution error

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