added pdf js script
fixed merge
fixed css bug