merge conflicts on pdf and log files
merge conflicts on pdf wtf