diff --git a/group_vars/thinkpad.yml b/group_vars/thinkpad.yml
index bea19aa..91d082a 100644
--- a/group_vars/thinkpad.yml
+++ b/group_vars/thinkpad.yml
@@ -40,10 +40,4 @@ print_os_vars: true
 install_pass_as_password_manager: true
 extra_bashrc: "alias dd='dd bs=4M status=progress oflag=dsync'"
 temporarily_disable_screensaver: false
-<<<<<<< HEAD
-
-sshd__key_types:
-  - 'ed25519'
-  - 'rsa'
-  - 'ecdsa'
 modify_lightdm: false