Fix unresolved conflicts in gitignore, readme and en-version of the book

en/13.5.md

@@ -127,11 +127,7 @@ func (this *EditController) Get() {
 	id, _ := strconv.Atoi(this.Ctx.Params[":id"])
 	this.Data["Post"] = models.GetBlog(id)
 	this.Layout = "layout.tpl"
-<<<<<<< HEAD
-	this.TplNames = "new.tpl"
-=======
 	this.TplNames = "edit.tpl"
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa
 }
 
 func (this *EditController) Post() {
@@ -154,17 +150,11 @@ type DeleteController struct {
 }
 
 func (this *DeleteController) Get() {
-<<<<<<< HEAD
-	id, _ := strconv.Atoi(this.Ctx.Params[":id"])
-	this.Data["Post"] = models.DelBlog(id)
-	this.Ctx.Redirect(302, "/")
-=======
 	id, _ := strconv.Atoi(this.Ctx.Input.Params[":id"])
 	blog := models.GetBlog(id)
  	this.Data["Post"] = blog
  	models.DelBlog(blog)
  	this.Ctx.Redirect(302, "/")
->>>>>>> eead24cf064976b648de5826eab51880c803b0fa
 }
 ```