Readded noConflict() support