Resolve previous merge and clean Jquery files