Merge and fix jQuery Conflict