removed extra js and css not needed
conflict resolved