update jQuery and DataTables
merge conflict resolution