diff --git a/PushButtonDemo/PushButtonDemo.pro.user b/PushButtonDemo/PushButtonDemo.pro.user
index 15b13cb..59ba040 100644
--- a/PushButtonDemo/PushButtonDemo.pro.user
+++ b/PushButtonDemo/PushButtonDemo.pro.user
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
+<<<<<<< HEAD
 <!-- Written by QtCreator 4.12.4, 2020-08-09T14:07:43. -->
+=======
+<!-- Written by QtCreator 4.12.4, 2020-08-09T07:26:29. -->
+>>>>>>> d7f2fc51f26ca3cea788e33e2071c2e98ba79048
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -54,6 +58,7 @@
  </data>
  <data>
   <variable>ProjectExplorer.Project.PluginSettings</variable>
+<<<<<<< HEAD
   <valuemap type="QVariantMap">
    <valuemap type="QVariantMap" key="ClangTools">
     <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
@@ -65,6 +70,9 @@
     <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
    </valuemap>
   </valuemap>
+=======
+  <valuemap type="QVariantMap"/>
+>>>>>>> d7f2fc51f26ca3cea788e33e2071c2e98ba79048
  </data>
  <data>
   <variable>ProjectExplorer.Project.Target.0</variable>
@@ -303,19 +311,32 @@
     </valuelist>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+<<<<<<< HEAD
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:E:/Qt/Qt_Projects/PushButtonDemo/PushButtonDemo.pro</value>
     <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">E:/Qt/Qt_Projects/PushButtonDemo/PushButtonDemo.pro</value>
+=======
+    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
+>>>>>>> d7f2fc51f26ca3cea788e33e2071c2e98ba79048
     <value type="QString" key="RunConfiguration.Arguments"></value>
     <value type="bool" key="RunConfiguration.Arguments.multi">false</value>
     <value type="QString" key="RunConfiguration.OverrideDebuggerStartup"></value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+<<<<<<< HEAD
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
+=======
+>>>>>>> d7f2fc51f26ca3cea788e33e2071c2e98ba79048
     <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
+<<<<<<< HEAD
     <value type="QString" key="RunConfiguration.WorkingDirectory.default">E:/Qt/Qt_Projects/build-PushButtonDemo-Desktop_Qt_5_15_0_MinGW_64_bit-Debug</value>
+=======
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default"></value>
+>>>>>>> d7f2fc51f26ca3cea788e33e2071c2e98ba79048
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>