resolved jquery $ confliction