Conflicts: common/lib/xmodule/xmodule/js/src/capa/display.coffee common/lib/xmodule/xmodule/tests/__init__.py common/lib/xmodule/xmodule/x_module.py lms/djangoapps/courseware/module_render.py
