diff --git a/config.yaml b/config.yaml
index 484fa06f..15de07f4 100644
--- a/config.yaml
+++ b/config.yaml
@@ -245,6 +245,7 @@ profiles:
   mko-laptop:
     include:
     - terminal
+    - media
   Edoras:
     include:
     - terminal
diff --git a/home/.gitconfig b/home/.gitconfig
index 9734926e..8be410c2 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -28,4 +28,4 @@
 	cmd = nvim -d -c 'set nomodifiable'
 
 [pull]
-	rebase = false
+	rebase = merges