diff --git a/README.md b/README.md
index bd468a046..223db985e 100755
--- a/README.md
+++ b/README.md
@@ -1267,7 +1267,6 @@ Winlin
 [bug #59]: https://github.com/simple-rtmp-server/srs/issues/59
 [bug #50]: https://github.com/simple-rtmp-server/srs/issues/50
 [bug #34]: https://github.com/simple-rtmp-server/srs/issues/34
-<<<<<<< HEAD
 [bug #367]: https://github.com/simple-rtmp-server/srs/issues/367
 [bug #319]: https://github.com/simple-rtmp-server/srs/issues/319
 [bug #367]: https://github.com/simple-rtmp-server/srs/issues/367
@@ -1284,11 +1283,10 @@ Winlin
 [bug #468]: https://github.com/simple-rtmp-server/srs/issues/468
 [bug #502]: https://github.com/simple-rtmp-server/srs/issues/502
 [bug #467]: https://github.com/simple-rtmp-server/srs/issues/467
-[bug #xxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxx
-=======
 [bug #512]: https://github.com/simple-rtmp-server/srs/issues/512
 [bug #xxxxxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxxxxx
->>>>>>> 2.0release
+
+[exo #828]: https://github.com/google/ExoPlayer/pull/828
 
 [r2.0a2]: https://github.com/simple-rtmp-server/srs/releases/tag/v2.0-a2
 [r2.0a1]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a1
diff --git a/trunk/src/kernel/srs_kernel_flv.cpp b/trunk/src/kernel/srs_kernel_flv.cpp
index ba59a8948..3fa1ccba1 100644
--- a/trunk/src/kernel/srs_kernel_flv.cpp
+++ b/trunk/src/kernel/srs_kernel_flv.cpp
@@ -381,7 +381,7 @@ int SrsFlvEncoder::write_header()
     char flv_header[] = {
         'F', 'L', 'V', // Signatures "FLV"
         (char)0x01, // File version (for example, 0x01 for FLV version 1)
-        (char)0x00, // 4, audio; 1, video; 5 audio+video.
+        (char)0x05, // 4, audio; 1, video; 5 audio+video.
         (char)0x00, (char)0x00, (char)0x00, (char)0x09 // DataOffset UI32 The length of this header in bytes
     };