resolved jquery conflicts