diff --git a/gin.go b/gin.go
index 5584bf0c..d0b02a58 100644
--- a/gin.go
+++ b/gin.go
@@ -189,10 +189,6 @@ func New() *Engine {
 	engine.pool.New = func() interface{} {
 		return engine.allocateContext()
 	}
-<<<<<<< Updated upstream
-	_ = engine.parseTrustedProxies()
-=======
->>>>>>> Stashed changes
 	return engine
 }