Change to merge conflict - pdf_output

Signed-off-by: Arnab Naha <superarnab@gmail.com>