some org-mode customizations
resolved merge conflict