commit before pull
merge
changed pdf printer offset
merge