diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..f4a63611
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+gns3/version.py merge=ours
+
diff --git a/gns3/version.py b/gns3/version.py
index 30ba8f9a..c9ee815c 100644
--- a/gns3/version.py
+++ b/gns3/version.py
@@ -25,5 +25,5 @@ or negative for a release candidate or beta (after the base version
 number has been incremented)
 """
 
-__version__ = "1.5.0a2"
+__version__ = "1.5.0dev3"
 __version_info__ = (1, 5, 0, -99)