scorm resources fix
conflict fix