Fixed jquery issuethat appeared after merge