(fix) changes.xml syntax issue

src/changes/changes.xml

@@ -61,11 +61,8 @@ The <action> type attribute can be add,update,fix,remove.
       <action                        dev="ecki" type="add">Site: added security report</action>
       <action                        dev="markt" due-to="Felix Schumacher">Improve performance for large multi-part boundaries</action>
       <action issue="FILEUPLOAD-286" dev="jochen" due-to="maxxedev" due-to-email="maxxedev@gmail.com">Added the default character set to the DiskFileItem.</action>
-<<<<<<< HEAD
-      <action issue="FILEUPLOAD-288" dev="jochen" due-to=""fangwentong" due-to-email="fangwentong2012@gmail.com">Avoid using File.exists() on temporary files, if we know that the file has been created.</action>
-=======
+      <action issue="FILEUPLOAD-288" dev="jochen" due-to="fangwentong" due-to-email="fangwentong2012@gmail.com">Avoid using File.exists() on temporary files, if we know that the file has been created.</action>
       <action dev="jochen" due-to="Pascal Schumacher">Added .travis.yml, to fix build issues on Github.</action>
->>>>>>> branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-fileupload.git
     </release>
 
     <release version="1.3.3" description="Bugfix release for 1.3.3" date="2017-06-13">