diff --git a/README.md b/README.md
index 43a2b5766df93d244ecdb252e9ee6bb2e8ed1b9f..38335fd9fc652d6206bdc2c8ed91110df080ff42 100644
--- a/README.md
+++ b/README.md
@@ -71,4 +71,3 @@ Here you will find a gif to visualize the simulation result.
 #### 6. User Departure (TUNi and TUNp)
 
 * If a user waits too long for a car, they leave the system. This is represented by the `TUNi` and `TUNp` transitions, which move tokens from the `PSDi` place without satisfying their demand.
->>>>>>> origin/master