From 4fae831b0cb0cdb61b134332d5c0812f7fadc8ac Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Mon, 25 Jan 2021 13:34:19 -0600
Subject: [PATCH] Creating a conflict

	modified:   README.md
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index cdef46b..a86de83 100644
--- a/README.md
+++ b/README.md
@@ -4,4 +4,8 @@
 
 This is an introduction.
 
+## Overview
+
+Some overview text.
+
 Argonne EIC software tutorial etc.
-- 
GitLab