diff --git a/config.go b/config.go
index 4f85ce02..2761e7cb 100644
--- a/config.go
+++ b/config.go
@@ -16,10 +16,6 @@ package beego
 
 import (
 	"fmt"
-<<<<<<< HEAD
-	"html/template"
-=======
->>>>>>> astaxie/develop
 	"os"
 	"path/filepath"
 	"strings"