Fixed jQuery code
Merge conflicts