resolved conflict with Requirejs #40895