merge unversioned mod for summer intern project, added config var for noConflict