diff --git a/.gitattibutes b/.gitattibutes
new file mode 100644
index 00000000..c36262c4
--- /dev/null
+++ b/.gitattibutes
@@ -0,0 +1 @@
+nanopart-server/src/main/resources/bootstrap.yml merge=ours
\ No newline at end of file