Add conflict resolution for jquery