Conflicts: common/lib/capa/capa/responsetypes.py common/lib/xmodule/xmodule/js/src/html/display.coffee lms/envs/common.py
