org-exp-blocks.el (org-ditaa-jar-path): Fix merge conflict.