Bug

Used unnesecary jquery
Merge