diff --git a/app.py b/app.py
index a9d086ced..6ad8b47ca 100644
--- a/app.py
+++ b/app.py
@@ -8,11 +8,7 @@
 @app.route('/', methods=('GET', 'POST'))
 def index():
     """Render the app's main page."""
-<<<<<<< HEAD
     if request.method == 'GET':
-=======
-    if request.methods == 'GET':
->>>>>>> ff0444aa864f91688c632ff0f143c4d5ae6e6317
         # Default gives IBM's ticker when first loaded.
         symbol = 'IBM'
         return render_template('index.html', symbol=symbol)