diff --git a/src/libcamera/include/merge_conflicts.h b/src/libcamera/include/merge_conflicts.h
new file mode 100644
index 000000000000..6e5b69a78c7a
--- /dev/null
+++ b/src/libcamera/include/merge_conflicts.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ * Copyright (C) 2020, Kieran Bingham
+ *
+ * merge_conflicts.h - Automatic merge conflict resolution
+ */
+
+#ifndef __LIBCAMERA_MERGE_CONFLICT_H__
+#define __LIBCAMERA_MERGE_CONFLICT_H__
+
+namespace libcamera {
+
+#ifndef __DOXYGEN__
+
+#define <<<<<<<< #if RANDOM % 2
+#define ======== #else
+#define >>>>>>>> #endif
+
+#endif
+
+} /* namespace libcamera */
+
+#endif /* __LIBCAMERA_MERGE_CONFLICT_H__ */