fix conflict

luotao1 · luotao1 · commit 0b37c2f67a2d · 2016-12-15T16:02:09.000+08:00
diff --git a/doc/howto/dev/contribute_to_paddle_cn.md b/doc/howto/dev/contribute_to_paddle_cn.md
diff --git a/doc/howto/index_cn.rst b/doc/howto/index_cn.rst
@@ -18,6 +18,7 @@
   :maxdepth: 1
 
   dev/write_docs_cn.rst
+  dev/contribute_to_paddle_cn.md
 
 模型配置
 --------
@@ -32,3 +33,5 @@
 
 ..  toctree::
   :maxdepth: 1
+
+  optimization/gpu_profiling_cn.rst
diff --git a/doc/howto/index_en.rst b/doc/howto/index_en.rst
@@ -33,4 +33,4 @@ Optimization
 ..  toctree::
   :maxdepth: 1
 
-  optimization/index_en.rst
+  optimization/gpu_profiling_en.rst
diff --git a/doc/howto/optimization/gpu_profiling_cn.rst b/doc/howto/optimization/gpu_profiling_cn.rst
@@ -1,5 +1,8 @@
-PaddlePaddle 性能分析与调优
-=====================================
+==================
+GPU性能分析与调优
+==================
+
+..  contents::
 
 此教程将向您分步介绍如何使用内置的定时工具、 **nvprof** 或 **nvvp** 来运行性能分析和调优。
 
diff --git a/doc/howto/optimization/gpu_profiling_en.rst b/doc/howto/optimization/gpu_profiling_en.rst
@@ -1,5 +1,8 @@
-Profiling on PaddlePaddle
-=========================
+====================
+Tune GPU Performance 
+====================
+
+..  contents::
 
 This tutorial will guide you step-by-step through how to conduct profiling and performance tuning using built-in timer, **nvprof** and **nvvp**.
 
diff --git a/doc/howto/optimization/index_en.rst b/doc/howto/optimization/index_en.rst
