added JQuery and Fixed Conflicts