diff --git a/roles/gap_utility_user/vars/main.yaml b/roles/gap_utility_user/vars/main.yaml
index e4a834aa5ac1f68d30cf5059c1148990408a9b7b..83950ed604cb442b1c981e9c939d231ec3a67c7f 100644
--- a/roles/gap_utility_user/vars/main.yaml
+++ b/roles/gap_utility_user/vars/main.yaml
@@ -15,4 +15,4 @@ goat_users:
     full_name: "Sergio Giménez"
     shell: "/bin/bash"
     ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEjoAgZWflGDDY8ZZITYwDBg8EuPbVD5F2XBkAeMxyou sergio.gimenez@i2cat.net"
->>>>>>> roles/gap_utility_user/vars/main.yaml
+