added semi-colon to end of noConflict() function