log and pdf changed
merge