Merge branch 'main' into 'user/carolina'

# Conflicts:
#   roles/gap_utility_user/vars/main.yaml

roles/gap_utility_user/vars/main.yaml

@@ -11,3 +11,8 @@ goat_users:
     full_name: "Carolina Fernandez"
     shell: "/bin/bash"
     ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDPm7bug6k5BX0vYNv4iTJk4U5JOFjFC4XwAcFY0b90mT7u6/7elTmwYniFmonPxxp/b+tkkNmQqjTKH2nofRhnVzdZe2ze4lPidSZ2zQQHejVcMMjFmClNby9JwtKwx25SaljU30NAnqOotLst8NTttBFy15buHXifRsiojpUV1O7n1LwDeCmEAauHF7HfInr4iEdZEEGwXr2bmnBvzkU7i0ikVcvpjBnKG1nVoSgOopozht/whvOSIEsRHaN/X585oq7sUI3D1yJN0RPMU5pbMvwUP6G+3MaVAQASviZyT11pQ01t6NPWu79OPIKmWXlfRj/2iXYtiABxxvQkOV/hBVPJVw7IgclneweuOk96xyVM1iNYjzydNDr9UJuTlI8R4AA2Br23dAPM4YRmyidiXGqAztDWFKOnthm8LDPG/EvW+QaYJ9btyS8UB6io8lfk4JXABJexmYPze0kdAIcTQIPQxk9imt9F0KiXD9AKxPgsikZpbya+5LJm1z/mBgVQJmxP9eDgceHzT6ErskkoeCH3apY7cYgmlv5vTpSji8roXey7sOuu43WrbvU1h03KkEQYm27TPt5quk+kXxV+krQ7CL1vLmvIkNwI0Q/DXHDRT4/mUJ9V0h7rAAy7HH/IeKRogETRu/qUcknBer//M4U/z4om/UaOQ+gt+YIN4Q== carolina@arachne"
+  - username: sergio
+    full_name: "Sergio Giménez"
+    shell: "/bin/bash"
+    ssh_key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEjoAgZWflGDDY8ZZITYwDBg8EuPbVD5F2XBkAeMxyou sergio.gimenez@i2cat.net"
+>>>>>>> roles/gap_utility_user/vars/main.yaml