From 0653044ca44993a118416931906ab9673672f158 Mon Sep 17 00:00:00 2001
From: "U-IGI\\gibbsd" <gibbsd@LAPLON1222.igi.ig.local>
Date: Wed, 11 Mar 2020 19:21:50 +0000
Subject: [PATCH 1/4] FIXAPI-1826

---
 .../src/main/resources/FIX50SP2.modified.xml               | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
index 082a65faa3..696206cdba 100644
--- a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
+++ b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
@@ -10111,6 +10111,7 @@
       <value enum="2" description="REJECTED"/>
       <value enum="3" description="TERMINATE_UNASSIGN"/>
     </field>
+<<<<<<< HEAD
     
     <!-- New Field for Position ID : See http://www.fixprotocol.org/specifications/fields -->
     <field number="7324" name="PositionId" type="STRING"/>
@@ -10189,5 +10190,11 @@
     </field>
     <field number="5019" name="AccountSummaryItemAmount" type="AMT"/>
     <field number="5020" name="AccountSummaryItemCurrency" type="CURRENCY"/>  
+    <field number="1687" name="ShortSaleRestriction" type="INT">
+	  <value enum="0" description="NO_RESTRICTIONS"/>
+      <value enum="1" description="SECURITY_NOT_SHORTABLE"/>
+      <value enum="2" description="SECURITY_NOT_SHORTABLE_AT_OR_BELOW_BEST_BID"/>
+      <value enum="3" description="SECURITY_NOT_SHORTABLE_WITHOUT_PREBORROW"/>
+    </field>	
   </fields>
 </fix>

From cdbeab7454ca4df9a8e9df9252f1ce56a199a499 Mon Sep 17 00:00:00 2001
From: "U-IGI\\gibbsd" <gibbsd@LAPLON1222.igi.ig.local>
Date: Thu, 12 Mar 2020 09:14:04 +0000
Subject: [PATCH 2/4] FIXAPI-1826 added ShortSaleRestriction to Instrument
 component

---
 .../src/main/resources/FIX50SP2.modified.xml                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
index 696206cdba..a9879cd1ea 100644
--- a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
+++ b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
@@ -5500,6 +5500,7 @@
       <field name="DatedDate" required="N"/>
       <field name="InterestAccrualDate" required="N"/>
       <component name="InstrumentParties" required="N"/>
+	  <field name="ShortSaleRestriction" required="N"/>
       <component name="ComplexEvents" required="N"/>
     </component>
     

From 1da566a8493a5c29872d4a0a456ea700195a524a Mon Sep 17 00:00:00 2001
From: "U-IGI\\gibbsd" <gibbsd@LAPLON1222.igi.ig.local>
Date: Thu, 12 Mar 2020 14:32:49 +0000
Subject: [PATCH 3/4] FIXAPI-1826 added ShortSaleRestriction to Instrument
 component, whitespace

---
 .../src/main/resources/FIX50SP2.modified.xml           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
index a9879cd1ea..2dc2468bc9 100644
--- a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
+++ b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
@@ -5500,7 +5500,7 @@
       <field name="DatedDate" required="N"/>
       <field name="InterestAccrualDate" required="N"/>
       <component name="InstrumentParties" required="N"/>
-	  <field name="ShortSaleRestriction" required="N"/>
+      <field name="ShortSaleRestriction" required="N"/>
       <component name="ComplexEvents" required="N"/>
     </component>
     
@@ -9532,7 +9532,7 @@
     <field number="1182" name="ApplBegSeqNum" type="SEQNUM"/>
     <field number="1183" name="ApplEndSeqNum" type="SEQNUM"/>
     <field number="1184" name="SecurityXMLLen" type="LENGTH"/>
-	<!-- MODIFIED: SecurityXML renamed to SecurityXMLData to prevent duplicate value -->
+    <!-- MODIFIED: SecurityXML renamed to SecurityXMLData to prevent duplicate value -->
     <field number="1185" name="SecurityXMLData" type="XMLDATA"/>
     <field number="1186" name="SecurityXMLSchema" type="STRING"/>
     <field number="1187" name="RefreshIndicator" type="BOOLEAN"/>
@@ -9656,7 +9656,7 @@
     <field number="1280" name="DerivativeEncodedSecurityDescLen" type="LENGTH"/>
     <field number="1281" name="DerivativeEncodedSecurityDesc" type="DATA"/>
     <field number="1282" name="DerivativeSecurityXMLLen" type="LENGTH"/>
-	<!-- MODIFIED: DerivativeSecurityXML renamed to DerivativeSecurityXMLData to prevent duplicate value -->
+    <!-- MODIFIED: DerivativeSecurityXML renamed to DerivativeSecurityXMLData to prevent duplicate value -->
     <field number="1283" name="DerivativeSecurityXMLData" type="DATA"/>
     <field number="1284" name="DerivativeSecurityXMLSchema" type="STRING"/>
     <field number="1285" name="DerivativeContractSettlMonth" type="MONTHYEAR"/>
@@ -10192,10 +10192,10 @@
     <field number="5019" name="AccountSummaryItemAmount" type="AMT"/>
     <field number="5020" name="AccountSummaryItemCurrency" type="CURRENCY"/>  
     <field number="1687" name="ShortSaleRestriction" type="INT">
-	  <value enum="0" description="NO_RESTRICTIONS"/>
+      <value enum="0" description="NO_RESTRICTIONS"/>
       <value enum="1" description="SECURITY_NOT_SHORTABLE"/>
       <value enum="2" description="SECURITY_NOT_SHORTABLE_AT_OR_BELOW_BEST_BID"/>
       <value enum="3" description="SECURITY_NOT_SHORTABLE_WITHOUT_PREBORROW"/>
-    </field>	
+    </field>
   </fields>
 </fix>

From 3f65afe50455b6079828c0b52280428dccd4dfdb Mon Sep 17 00:00:00 2001
From: "U-IGI\\gibbsd" <gibbsd@LAPLON1222.igi.ig.local>
Date: Thu, 12 Mar 2020 14:59:14 +0000
Subject: [PATCH 4/4] fixed error in merge ShortSaleRestriction

---
 .../src/main/resources/FIX50SP2.modified.xml                     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
index 2dc2468bc9..3f6a3aa11a 100644
--- a/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
+++ b/quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml
@@ -10112,7 +10112,6 @@
       <value enum="2" description="REJECTED"/>
       <value enum="3" description="TERMINATE_UNASSIGN"/>
     </field>
-<<<<<<< HEAD
     
     <!-- New Field for Position ID : See http://www.fixprotocol.org/specifications/fields -->
     <field number="7324" name="PositionId" type="STRING"/>