ZF2 merge error from official

remote: Counting objects: 1032, done.
remote: Compressing objects: 100% (320/320), done.
remote: Total 836 (delta 508), reused 691 (delta 416)
Receiving objects: 100% (836/836), 322.07 KiB | 56 KiB/s, done.
Resolving deltas: 100% (508/508), completed with 120 local objects.
From git://git.zendframework.com/zf
 * branch            master     -> FETCH_HEAD
CONFLICT (rename/add): Rename library/Zend/Feed/PubSubHubbub/Model/ModelAbstract.php->library/Zend/Markup/Renderer/Markup/Replace.php in ccb08e825849762b96d0c6db327d2fc159384d68. library/Zend/Markup/Renderer/Markup/Replace.php added in HEAD
Adding as library/Zend/Markup/Renderer/Markup/Replace.php~HEAD instead
CONFLICT (rename/rename): Rename "library/Zend/Markup/Renderer/HTML/Code.php"->"library/Zend/Markup/Renderer/Markup/Replace.php" in branch "HEAD" rename "library/Zend/Markup/Renderer/HTML/Code.php"->"library/Zend/Markup/Renderer/Markup/HTML/Code.php" in "ccb08e825849762b96d0c6db327d2fc159384d68"
Renaming library/Zend/Markup/Renderer/HTML/HTMLAbstract.php->library/Zend/Markup/Renderer/Markup/MarkupInterface.php
Auto-merging library/Zend/Markup/Renderer/Markup/MarkupInterface.php
Renaming library/Zend/Markup/Renderer/HTML/Img.php->library/Zend/Markup/Renderer/Markup/HTML/Img.php
Auto-merging library/Zend/Markup/Renderer/Markup/HTML/Img.php
Renaming library/Zend/Markup/Renderer/HTML/ListItem.php->library/Zend/Markup/Renderer/Markup/HTML/ListItem.php
Auto-merging library/Zend/Markup/Renderer/Markup/HTML/ListItem.php
Renaming library/Zend/Markup/Renderer/HTML/URL.php->library/Zend/Markup/Renderer/Markup/HTML/URL.php
Auto-merging library/Zend/Markup/Renderer/Markup/HTML/URL.php
Renaming library/Zend/Markup/Renderer/TokenConverterInterface.php->library/Zend/Markup/Renderer/Markup/HTML/Replace.php
Auto-merging library/Zend/Markup/Renderer/Markup/HTML/Replace.php
Removing demos/Zend/Service/LiveDocx/common.php
Removing library/Zend/Feed/AbstractFeed.php
Removing library/Zend/Feed/Atom.php
Removing library/Zend/Feed/Builder/Builder.php
Removing library/Zend/Feed/Builder/BuilderInterface.php
Removing library/Zend/Feed/Builder/Entry.php
Removing library/Zend/Feed/Builder/Header/Header.php
Removing library/Zend/Feed/Builder/Header/Itunes.php
Removing library/Zend/Feed/Builder/Header/iTunes.php
Removing library/Zend/Feed/Element.php
Removing library/Zend/Feed/Entry/AbstractEntry.php
Removing library/Zend/Feed/Entry/Atom.php
Removing library/Zend/Feed/Entry/RSS.php
Removing library/Zend/Feed/Entry/Rss.php
Removing library/Zend/Feed/Exception.php
Removing library/Zend/Feed/Feed.php
Removing library/Zend/Feed/PubSubHubbub/CallbackAbstract.php
Removing library/Zend/Feed/PubSubHubbub/CallbackInterface.php
Removing library/Zend/Feed/PubSubHubbub/Exception.php
Removing library/Zend/Feed/PubSubHubbub/HttpResponse.php
Removing library/Zend/Feed/PubSubHubbub/Model/Subscription.php
Removing library/Zend/Feed/PubSubHubbub/Model/SubscriptionInterface.php
Removing library/Zend/Feed/PubSubHubbub/Publisher.php
Removing library/Zend/Feed/PubSubHubbub/Subscriber/Callback.php
Removing library/Zend/Feed/RSS.php
Removing library/Zend/Feed/Reader/Entry/RSS.php
Removing library/Zend/Feed/Reader/Feed/RSS.php
Removing library/Zend/Feed/Rss.php
Removing library/Zend/Feed/Writer/Renderer/Entry/RSS.php
Removing library/Zend/Feed/Writer/Renderer/Feed/RSS.php
Removing tests/Zend/Feed/ArrayAccessTest.php
Removing tests/Zend/Feed/AtomEntryOnlyTest.php
Removing tests/Zend/Feed/AtomPublishingTest.php
Removing tests/Zend/Feed/CountTest.php
Removing tests/Zend/Feed/ElementTest.php
Removing tests/Zend/Feed/Entry/RSSTest.php
Removing tests/Zend/Feed/ImportTest.php
Removing tests/Zend/Feed/IteratorTest.php
Removing tests/Zend/Feed/_files/AtomHOnline.xml
Removing tests/Zend/Feed/_files/AtomPublishingTest-before-update.xml
Removing tests/Zend/Feed/_files/AtomPublishingTest-created-entry.xml
Removing tests/Zend/Feed/_files/AtomPublishingTest-expected-update.xml
Removing tests/Zend/Feed/_files/AtomPublishingTest-updated-entry.xml
Removing tests/Zend/Feed/_files/AtomTestGoogle.xml
Removing tests/Zend/Feed/_files/AtomTestMozillazine.xml
Removing tests/Zend/Feed/_files/AtomTestOReilly.xml
Removing tests/Zend/Feed/_files/AtomTestPlanetPHP.xml
Removing tests/Zend/Feed/_files/AtomTestSample1.xml
Removing tests/Zend/Feed/_files/AtomTestSample2.xml
Removing tests/Zend/Feed/_files/AtomTestSample3.xml
Removing tests/Zend/Feed/_files/AtomTestSample4.xml
Removing tests/Zend/Feed/_files/RssTest091Sample1.xml
Removing tests/Zend/Feed/_files/RssTest092Sample1.xml
Removing tests/Zend/Feed/_files/RssTest100Sample1.xml
Removing tests/Zend/Feed/_files/RssTest100Sample2.xml
Removing tests/Zend/Feed/_files/RssTest200Sample1.xml
Removing tests/Zend/Feed/_files/RssTestCNN.xml
Removing tests/Zend/Feed/_files/RssTestHarvardLaw.xml
Removing tests/Zend/Feed/_files/RssTestPlanetPHP.xml
Removing tests/Zend/Feed/_files/RssTestSlashdot.xml
Removing tests/Zend/Feed/_files/TestAtomFeed.xml
Removing tests/Zend/Feed/_files/TestAtomFeedEntryOnly.xml
Removing tests/Zend/Feed/_files/TestAtomFeedNamespaced.xml
Removing tests/Zend/Feed/_files/TestFeedEntryRssContentEncoded.xml
Removing tests/Zend/Feed/_files/htmlPage.html
Removing tests/Zend/OpenId/ResponseHelper.php
Removing tests/Zend/Service/TwitterTest.php
Automatic merge failed; fix conflicts and then commit the result.