Fixed a merge conflict

doc/sphinx/_static/sphinx_design.css

doc/sphinx/book/app/a_errcodes.rst

doc/sphinx/book/app/b_proctitle.rst

doc/sphinx/book/app/c_lua_tutorial.rst

doc/sphinx/book/app/d_plugins.rst

doc/sphinx/book/app/e_sophia/i1.png

doc/sphinx/book/app/e_sophia/i10.png

doc/sphinx/book/app/e_sophia/i12.png

doc/sphinx/book/app/e_sophia/i13.png

doc/sphinx/book/app/e_sophia/i14.png

doc/sphinx/book/app/e_sophia/i2.png

doc/sphinx/book/app/e_sophia/i3.png

doc/sphinx/book/app/e_sophia/i4.png

doc/sphinx/book/app/e_sophia/i5.png

doc/sphinx/book/app/e_sophia/i6.png

doc/sphinx/book/app/e_sophia/i7.png

doc/sphinx/book/app/e_sophia/i8.png

doc/sphinx/book/app/e_sophia/i9.png

doc/sphinx/book/app/e_sophia/index.rst

doc/sphinx/book/app_d_plugins.rst