removing conflicted js