cleared js & css
conflict resolved