diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..dafc81f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.idea/** merge=ignore
\ No newline at end of file
diff --git a/version/Version.go b/version/Version.go
index c6fbd63..61ddd57 100644
--- a/version/Version.go
+++ b/version/Version.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-const VERSION = "1.0.2"
+const VERSION = "1.0.5"
 
 func GetGoVersion() (ver string) {
 	ver = runtime.Version()