fix jira macro and diff.