Index: firmware/.launches/DG.launch
===================================================================
diff -u -r45f4646609e6dd39691102e109d0b5c14f97e054 -r3eb7c2e62c727be195cd937d49957db9d4ba83b4
--- firmware/.launches/DG.launch	(.../DG.launch)	(revision 45f4646609e6dd39691102e109d0b5c14f97e054)
+++ firmware/.launches/DG.launch	(.../DG.launch)	(revision 3eb7c2e62c727be195cd937d49957db9d4ba83b4)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="com.ti.ccstudio.debug.launchType.device.debugging">
+<<<<<<< HEAD
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_dg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_dg_develop/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_dg_flush/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;FlashEraseSelection&quot;&gt;&#10;    &lt;curValue&gt;Necessary Sectors Only (for Program Load)&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
@@ -17,6 +18,13 @@
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM./home/fw/workspace_dg_develop/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="/home/fw/workspace_dg_develop/dgfirmware/firmware/Debug/DG.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM./home/fw/workspace_dg_flush/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="/home/fw/workspace_dg_flush/dgfirmware/firmware/Debug/DG.out"/>
 <stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM./home/fw/wsdg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="/home/fw/wsdg/dgfirmware/firmware/Debug/DG.out"/>
+=======
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_DEBUGGER_PROPERTIES./home/fw/workspace_dg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot; ?&gt;&#10;&lt;PropertyValues&gt;&#10;&#10;  &lt;property id=&quot;ConnectOnStartup&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;EnableInstalledBreakpoint&quot;&gt;&#10;    &lt;curValue&gt;1&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;IgnoreSoftLaunchFailures&quot;&gt;&#10;    &lt;curValue&gt;0&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;  &lt;property id=&quot;FlashEraseSelection&quot;&gt;&#10;    &lt;curValue&gt;Necessary Sectors Only (for Program Load)&lt;/curValue&gt;&#10;  &lt;/property&gt;&#10;&#10;&lt;/PropertyValues&gt;&#10;"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROGRAM./home/fw/workspace_dg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="${build_artifact:DG}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_PROJECT./home/fw/workspace_dg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="DG"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.ATTR_TARGET_CONFIG" value="${target_config_active_default:DG}"/>
+<stringAttribute key="com.ti.ccstudio.debug.debugModel.MRU_PROGRAM./home/fw/workspace_dg/dgfirmware/firmware/targetConfigs/RM46L852.ccxml.Texas Instruments XDS110 USB Debug Probe/CortexR4" value="/home/fw/workspace_dg/dgfirmware/firmware/Debug/DG.out"/>
+>>>>>>> staging
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/DG"/>
 </listAttribute>