added to jQuery
fixing merge errors