fixed merge errors
updated jQuery file