diff --git a/README.md b/README.md
index 73f0b05b7..3a0d67cc1 100644
--- a/README.md
+++ b/README.md
@@ -4,15 +4,8 @@ DiscoPoP is an open-source tool that helps software developers parallelize their
 In a nutshell, DiscoPoP performs the following steps:
 * detect parts of the code (computational units or CUs) with little to no internal parallelization potential,
 * find data dependences among them,
-<<<<<<< HEAD
-* identifie parallel patterns that can be used to parallelize a code region,
-* and finally suggest corresponding OpenMP parallelization constructs and clauses to programmers.
-
-A more comprehensive overview of DiscoPoP can be found on our [project website](http://www.discopop.org/).
-=======
 * identify parallel patterns that can be used to parallelize a code region,
 * and finally suggest corresponding OpenMP parallelization constructs and clauses to programmers.
->>>>>>> develop
 
 DiscoPoP is built on top of LLVM. Therefore, DiscoPoP can perform the above-mentioned steps on any source code which can be transferred into the LLVM IR.
 
diff --git a/discopop_explorer/README.md b/discopop_explorer/README.md
index 193bf3032..30b5da53f 100644
--- a/discopop_explorer/README.md
+++ b/discopop_explorer/README.md
@@ -26,11 +26,7 @@ To run the graph analyzer, you can use the following command:
 
 You can specify the path to DiscoPoP output files. Then, the Python script searches within this path to find the required files. Nevertheless, if you are interested in passing a specific location to each file, here is the detailed usage:
 
-<<<<<<< HEAD:graph_analyzer/README.md
-    graph_analyzer.py [--path <path>] [--cu-xml <cuxml>] [--dep-file <depfile>] [--plugins <plugs>] [--loop-counter <loopcount>] [--reduction <reduction>] [--json <json>]
-=======
     `discopop_explorer [--path <path>] [--cu-xml <cuxml>] [--dep-file <depfile>] [--plugins <plugs>] [--loop-counter <loopcount>] [--reduction <reduction>] [--json <json>]`
->>>>>>> develop:discopop_explorer/README.md
 
 Options:
 ```
@@ -56,11 +52,7 @@ The loop itself sums up all numbers from 1 to n.
 
 You can run DiscoPoP on **main.c** or just use included output.
 
-<<<<<<< HEAD:graph_analyzer/README.md
-After that, you can run **graph_analyzer.py** from **graph_analyzer**. The **--path** argument should point to the output of DiscoPoP.
-=======
 After that, you can run **discopop_explorer**. The **--path** argument should point to the output of the DiscoPoP.
->>>>>>> develop:discopop_explorer/README.md
 
 In this example, the output for reduction will point to the lines 6-9, and it will suggest **pragma omp parallel for** OpenMP directive for parallelizing the loop.
 You will also find **i** classified as a private variable and **sum** as a reduction variable. Thus, the parallelization directive would be suggested as follows: