merge
fixed jquery and comments work