Hello Nicolas,
The complete diff is:

$ ~/src$ git clone https://code.orgmode.org/bzg/org-mode.git
$ cd org-mode
$ git merge origin/wip-cite

Auto-merging testing/lisp/test-org-element.el
Auto-merging lisp/org-element.el
CONFLICT (content): Merge conflict in lisp/org-element.el
Automatic merge failed; fix conflicts and then commit the result.

$ git diff
diff --cc lisp/org-element.el
index cdb574e17,f7498fbd1..000000000
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@@ -307,12 -322,11 +322,20 @@@ Don't modify it, set `org-element-affil
        (strike-through ,@standard-set)
        (subscript ,@standard-set)
        (superscript ,@standard-set)
++<<<<<<< HEAD
 +      ;; Ignore inline babel call and inline source block as formulas
 +      ;; are possible.  Also ignore line breaks and statistics
 +      ;; cookies.
 +      (table-cell bold code entity export-snippet footnote-reference italic
 +                latex-fragment link macro radio-target strike-through
 +                subscript superscript target timestamp underline verbatim)
++=======
+       ;; Ignore inline babel call and inline src block as formulas are
+       ;; possible.  Also ignore line breaks and statistics cookies.
+       (table-cell ,@(append '(export-snippet footnote-reference link macro
+                                            radio-target target timestamp)
+                           minimal-set))
++>>>>>>> origin/wip-cite
        (table-row table-cell)
        (underline ,@standard-set)
        (verse-block ,@standard-set)))



On Fri, Nov 23, 2018 at 2:32 PM Nicolas Goaziou <mail@nicolasgoaziou.fr>
wrote:

> Hello,
>
> Qiang Fang <godblessfq@gmail.com> writes:
>
> > I am a user of kjambunathan's org-mode-ox-odt. The odt exporter needs
> some
> > changed in the upstream org mode. Can you please kindly review the
> > request?
>
> You need to pull again "wip-cite" branch. It was rebased against master
> yesterday. So was "wip-cite-awe".
>
> Regards,
>
> --
> Nicolas Goaziou
>