Updated settings @pdf2htmlEX
version bump
resolved conflicts