diff --git a/flask/forest/__init__.py b/flask/forest/__init__.py
index d72505e..e313d83 100644
--- a/flask/forest/__init__.py
+++ b/flask/forest/__init__.py
@@ -31,10 +31,6 @@ sys.stderr.flush()
 
 app = Flask(__name__)
 app.config.from_object("forest.config.Config")
-<<<<<<< HEAD
-
-=======
->>>>>>> 830f996d6068222f74a4460d104568313b8d4434
 db = SQLAlchemy(app)
 #db = SQLAlchemy(session_options = { "autoflush": False })
 db.init_app(app)