diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf
index 2634b9a3b..4375d4a92 100755
--- a/trunk/conf/srs.conf
+++ b/trunk/conf/srs.conf
@@ -1,14 +1,11 @@
 # the listen ports, split by space.
 listen              1935;
-<<<<<<< HEAD
-=======
 # the default chunk size is 128, max is 65536,
 # some client does not support chunk size change,
 # however, most clients supports it and it can improve 
 # performance about 10%.
 # default: 60000
 chunk_size          60000;
->>>>>>> upstream/master
 # the logs dir.
 # if enabled ffmpeg, each stracoding stream will create a log file.
 # default: ./objs/logs