diff --git a/README.md b/README.md
index 6b8bc5e5aeae0cd2c24b43d4da2bbc56afee44a3..927ab45cd034cda64cb50592edb9d9337af7f702 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Project description
 To come...
 
@@ -19,25 +18,11 @@ In order to keep the wire tensioned during the foam cutting application sensor d
 ## Hot Wire
 The wire is going to be heated by appling a voltage that results in a current, depending on the resistance of the wire. The current is going to be controlled using a dc converter.
 
-=======
-# Kinematics implementation
-Using the Robotics Library kinematic configuration of the robot can be specified using a xml or urdf file. At first the DH-parameters of an past project were used and implemented according to the tutorial of RL. RL uses the standard convention for specifing the dh parameter, namely:
-
-
-- d: specifies the translation along the previous z axis
-- theta: is the rotation around the previous z axis to align with the new x axis
-- a: defines the translation along the new x axis
-- alpha: gives the rotation around the new x axis to align with the new z axis
-
-Unfortunately the parameters are for an older version of YuMi called Frida and do not match the TCP position and orientation when comparing against RobotStudio in a given joint configuration.
-Fortunately there is another option to specifies the kinematics for a robot over a urdf file and there is already a model existing in the repo of OrebroUniversity. Their urdf-description file was then edited (which is not recommended but works) in order to specify the kinematic configuration for the left and right arm of YuMi. When comparing the resulting positions and orientations of the forward kinematics there is still an offset between the manual forward kinematics and RobotStudio. This is because the TCP-reference frame is not the same, as it can be seen in picture xy.
->>>>>>> f61f214bbe7cde1918af9bb232f3b67cab4d4a9c
 
 # Installation instructions
 ## C++ 
 The project needs a few dependencies to be installed. These are broccoli, the robotics library as well as pybind11 in order to create bindings between Python and C++ code. To prevent any troubles while installing them in the next step make sure you have the following packages installed. Check or otherwise install them running `sudo apt install cmake python3-dev python3-distutils` in the command line.
 
-<<<<<<< HEAD
 Download eigen and put them into your `/opt/` folder.
 ### pybind11
 There are several ways how to use pybind11. Number 1 was tested succesfully and is recommanded
@@ -50,11 +35,6 @@ git submodule update --init
 ```
 
 2. Run the following commands to install pybind11 globally to your system
-=======
-Download the robotics library and eigen and put them into `/opt/`. Brocolli and pybind11 are directly installed to the system. Therefore clone the respective repo using git. 
-### pybind11
-Run the following commands to install pybind11 globally to your system
->>>>>>> f61f214bbe7cde1918af9bb232f3b67cab4d4a9c
 ```
 # Classic CMake
 cd pybind11
@@ -72,18 +52,13 @@ cmake --install build
 Installation instruction for pybind11 can be also found [here](https://pybind11.readthedocs.io/en/stable/compiling.html#building-with-cmake)
 
 ### broccoli
-<<<<<<< HEAD
 Broccoli can be directly installed to the system (tested and works) or included as an external project. To install broccoli directly to the system clone the respective repo using git. Then cd in cloned brocolli repo and run the following commands to install brocolli to your system
-=======
-cd in cloned brocolli repo. Then run the commands to install brocolli to your system
->>>>>>> f61f214bbe7cde1918af9bb232f3b67cab4d4a9c
 ```
 mkdir build
 cd build
 cmake ..
 make install
 ```
-<<<<<<< HEAD
 Broccoli and installation instruction can be found [here](https://gitlab.control.lth.se/gosda/broccoli-library).
 
 ### Robotics Library
@@ -135,6 +110,4 @@ The python binding code (the generated *.so file) can be imported by running `im
 
 
 
-=======
->>>>>>> f61f214bbe7cde1918af9bb232f3b67cab4d4a9c