diff --git a/4 Qualifying Exam/2 Writing/1. QE Goals and Outcomes.md b/4 Qualifying Exam/2 Writing/1. QE Goals and Outcomes.md
index 8a0dc404a..d3ff64a16 100644
--- a/4 Qualifying Exam/2 Writing/1. QE Goals and Outcomes.md	
+++ b/4 Qualifying Exam/2 Writing/1. QE Goals and Outcomes.md	
@@ -65,9 +65,6 @@ If this research is successful, this diffusion model will accomplish three main
 If this research is successful, this diffusion model will accomplish three main tasks:
 **Outcome 1: Approximate a set of controllable plants by generating a large number of perturbed examples**
 
-<<<<<<< HEAD
-**Outcomes**
-=======
 **Outcome 2: Perturb a nominal plant in an unstructured manner with a controllable amount of uncertainty**
 
 **Outcome 3: Generate time and frequency domain responses based on training data of example systems. **
@@ -81,4 +78,3 @@ Topic: Generating perturbations requires a lot of effort.
 Point: We look to generative models to accelerate perturbed plant generation. 
 
 **Fifth Paragraph: Broader Impact**
->>>>>>> origin/master