git pull failed

[Han Pingtian <hanpt@xxxxxxxxxxxxxxxxxx>]

Hi,

Today git pull failed with those message:

% git pull
remote: Counting objects: 51, done.
remote: Compressing objects: 100% (35/35), done.
remote: Total 35 (delta 30), reused 0 (delta 0)
Unpacking objects: 100% (35/35), done.
From git://git.code.sf.net/p/zsh/code
 + ca946b6...be5f561 master     -> origin/master  (forced update)
Auto-merging Doc/Zsh/prompt.yo
Auto-merging ChangeLog
CONFLICT (content): Merge conflict in ChangeLog
Automatic merge failed; fix conflicts and then commit the result.

And this is the head of ChangeLog:

<<<<<<< HEAD
2015-03-05  Jun-ichi Takimoto <takimoto-j@xxxxxxxxxxxxxxxxx>
=======
2015-04-07  Jun-ichi Takimoto <takimoto-j@xxxxxxxxxxxxxxxxx>

        * 34850: Doc/zman.yo, Doc/ztexi.yo, Doc/META-FAQ.yo,
        Doc/Zsh/contrib.yo, Doc/Zsh/ftp_sites.yo, Doc/Zsh/manual.yo,
        Doc/Zsh/metafaq.yo, Doc/Zsh/roadmap.yo: make URLs in html/pdf
        docs clickable

2015-04-06  Barton E. Schaefer  <schaefer@xxxxxxx>

        * 34851: Src/builtin.c: fix thinko from 34093 that short-circuited
        some "whence -m" searches

2015-04-03  Barton E. Schaefer  <schaefer@xxxxxxx>

        * 34837: Src/glob.c: avoid loss of original file path when applying
        colon-modifiers in glob qualifiers, that path is still needed for
        later stat() when sorting.

2015-04-03  Jun-ichi Takimoto <takimoto-j@xxxxxxxxxxxxxxxxx>

        * 34840: Doc/Zsh/prompt.yo: minor format fixes

2015-04-02  Jun-ichi Takimoto <takimoto-j@xxxxxxxxxxxxxxxxx>
>>>>>>> be5f561fa4cfd2f9c705fc24bdbc096070586a74

What shall I do for pulling master?