diff --git a/.gitignore b/.gitignore
index 81a6553ed..88212b6f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.o
 *.so
 *.swap
+*.pcap
 dpdk/x86_64-native-linuxapp-gcc/
 example/helloworld
 example/helloworld_epoll
@@ -20,3 +21,5 @@ lib/machine_include/
 lib/vnode_if.h
 lib/vnode_if_newproto.h
 lib/vnode_if_typedef.h
+app/nginx-1.11.10/objs/
+app/nginx-1.11.10/Makefile
diff --git a/README.md b/README.md
index 5ede09dce..80a291c7b 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,11 @@ Currently, besides authorized DNS server of DNSPod, there are various products i
 ## Quick Start
 
     # clone F-Stack
+<<<<<<< HEAD
     mkdir -p /data/f-stack
+=======
+    mkdir /data/f-stack
+>>>>>>> aca62ecc5596c6283719465d643b88198182810f
     git clone https://github.com/F-Stack/f-stack.git /data/f-stack
 
     # install libnuma-dev
diff --git a/doc/F-Stack_API_Reference.md b/doc/F-Stack_API_Reference.md
index 0f426aa68..5dff57455 100644
--- a/doc/F-Stack_API_Reference.md
+++ b/doc/F-Stack_API_Reference.md
@@ -23,7 +23,11 @@ Initialize F-Stack，including DPDK/FreeBSD network stack, etc.
 #### ff_run
 
 	void ff_run(loop_func_t loop, void *arg);
+<<<<<<< HEAD
 loop is a callback function，the service logic is implemented by the user, and called by each poll of F-Stack .
+=======
+loop is a callbask function，the service logic is implemented by the user, and called by each poll of F-Stack .
+>>>>>>> aca62ecc5596c6283719465d643b88198182810f
 
 ### Control API
 
@@ -249,4 +253,4 @@ However, it is  supported only before F-Stack is started.
  - FF_DISPATCH_ERROR (-1)
    Error occurs or packet is handled by user, packet will be freed.
  - FF_DISPATCH_RESPONSE (-2)
-   Packet is handled by user, packet will be responsed.
\ No newline at end of file
+   Packet is handled by user, packet will be responsed.
diff --git a/doc/F-Stack_Quick_Start_Guide.md b/doc/F-Stack_Quick_Start_Guide.md
index 42078bd2d..6440a54b6 100644
--- a/doc/F-Stack_Quick_Start_Guide.md
+++ b/doc/F-Stack_Quick_Start_Guide.md
@@ -75,5 +75,9 @@ The mount point can be made permanent across reboots, by adding the following li
 	# run with start.sh
 	./start.sh -b ./redis-server -o /path/to/redis.conf
 	# or run like this:
+<<<<<<< HEAD
 	#./redis-server --conf config.ini --proc-type=primary --proc-id=0 /path/to/redis.conf
+=======
+	#./redis-server --conf=config.ini --proc-type=primary --proc-id=0 /path/to/redis.conf
+>>>>>>> aca62ecc5596c6283719465d643b88198182810f