added yui resolving conflict
added yui resolving conflict

lukehoban/jsconsole,gnoesiboe/jsconsole,remy/jsconsole,fend-classroom/jsconsole,rev22/coffeeconsole,gnoesiboe/jsconsole,remy/jsconsole,fend-classroom/jsconsole