added reference to Two for noConflict resolve
merge
fixed inheritance bug