diff --git a/debian/.~angelog b/debian/.~angelog
new file mode 100644
index 00000000..b493b869
Binary files /dev/null and b/debian/.~angelog differ
diff --git a/debian/changelog b/debian/changelog
index c662c8b9..0472ddff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kylin-nm (1.0.5-0ubuntu1) eoan; urgency=medium
+
+    * Change the method to get the path of carrier file
+
+ -- handsome_feng <jianfengli@ubuntukylin.com>  Tue, 24 Sep 2019 12:51:40 +0800
+
 kylin-nm (1.0.4-0ubuntu1) eoan; urgency=medium
 
   * Bug-fix:
diff --git a/kylin-nm.pro.user b/kylin-nm.pro.user
index cb7bebe7..3ce1de91 100644
--- a/kylin-nm.pro.user
+++ b/kylin-nm.pro.user
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
+<<<<<<< HEAD
 <!-- Written by QtCreator 4.6.2, 2019-09-24T13:06:38. -->
+=======
+<!-- Written by QtCreator 4.6.2, 2019-09-23T17:00:02. -->
+>>>>>>> b43f78de198252c1f54a06af74b0f347f757ec1d
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>