diff --git a/caldav/.config/vdirsyncer/config b/caldav/.config/vdirsyncer/config
index 68dd2b0..ac09de1 100644
--- a/caldav/.config/vdirsyncer/config
+++ b/caldav/.config/vdirsyncer/config
@@ -8,6 +8,7 @@ a = "my_calendar_local"
 b = "my_calendar_remote"
 collections = ["from a", "from b"]
 metadata = ["displayname", "color"]
+conflict_resolution = "b wins"
 
 # --- LOCAL STORAGE ---
 # Where the calendar files will sit on your Linux machine
@@ -30,6 +31,7 @@ password.fetch = ["shell", "cat ~/Dotfiles/.secrets/vdirsyncer_secret"]
 a = "school_sched_local"
 b = "school_sched_remote"
 collections = null
+conflict_resolution = "b wins"
 # collections = ["from a", "from b"]
 
 [storage school_sched_local]
@@ -49,6 +51,7 @@ a = "school_task_local"
 b = "school_task_remote"
 collections = null
 # collections = ["from a", "from b"]
+conflict_resolution = "b wins"
 
 [storage school_task_local]
 type = "filesystem"