initial merge and removal of jquery