Modified the notebook (#10)

* Uploading conflict notebook

* Modify

* Changes to conflict analysis

* Included more conflict analysis

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbnda_adm0_IGNN_20230720.CPG

@@ -0,0 +1 @@
+UTF-8

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbnda_adm0_IGNN_20230720.prj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbnda_adm1_IGNN_20230720.CPG

@@ -0,0 +1 @@
+UTF-8

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbnda_adm1_IGNN_20230720.prj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbnda_adm2_IGNN_20230720.CPG

@@ -0,0 +1 @@
+UTF-8

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbnda_adm2_IGNN_20230720.prj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbnda_adm3_IGNN_20230720.CPG

@@ -0,0 +1 @@
+UTF-8

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbnda_adm3_IGNN_20230720.prj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbndl_admALL_IGNN_itos_20230720.CPG

@@ -0,0 +1 @@
+UTF-8

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbndl_admALL_IGNN_itos_20230720.prj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbndp_admALL_IGNN_itos_20230720.CPG

@@ -0,0 +1 @@
+UTF-8

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbndp_admALL_IGNN_itos_20230720.prj

@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbndt_adminUnitLookup.cpg

@@ -0,0 +1 @@
+UTF-8

data/shapefiles/ner_adm_ignn_20230720_ab_shp/NER_admbndt_adminUnitLookup.dbf.xml

@@ -0,0 +1 @@
+<metadata xml:lang="en"><Esri><CreaDate>20180822</CreaDate><CreaTime>11364400</CreaTime><ArcGISFormat>1.0</ArcGISFormat><ArcGISstyle>North American Profile of ISO19115 2003</ArcGISstyle><SyncOnce>FALSE</SyncOnce><DataProperties><lineage><Process Name="Create Table (3)" ToolSource="c:\program files (x86)\arcgis\desktop10.1\ArcToolbox\Toolboxes\Data Management Tools.tbx\CreateTable" Date="20180822" Time="113644">CreateTable \\os.uga.edu\onu-ocha\working\Process_Files\CODServices\Documentation\Templates\COD_XXX\Shapefiles\XXX_AdminBoundaries_ExportToShape.gdb XXX_admbndt_adminUnitLookup # #</Process><Process Name="Add Field (20)" ToolSource="c:\program files (x86)\arcgis\desktop10.1\ArcToolbox\Toolboxes\Data Management Tools.tbx\AddField" Date="20180822" Time="113646">AddField \\os.uga.edu\onu-ocha\working\Process_Files\CODServices\Documentation\Templates\COD_XXX\Shapefiles\XXX_AdminBoundaries_ExportToShape.gdb\XXX_admbndt_adminUnitLookup admNum SHORT # # # # NULLABLE NON_REQUIRED #</Process><Process Name="Add Field (23)" ToolSource="c:\program files (x86)\arcgis\desktop10.1\ArcToolbox\Toolboxes\Data Management Tools.tbx\AddField" Date="20180822" Time="113648">AddField \\os.uga.edu\onu-ocha\working\Process_Files\CODServices\Documentation\Templates\COD_XXX\Shapefiles\XXX_AdminBoundaries_ExportToShape.gdb\XXX_admbndt_adminUnitLookup admTitle TEXT # # 50 # NULLABLE NON_REQUIRED #</Process><Process Name="Add Field (23)" ToolSource="c:\program files (x86)\arcgis\desktop10.1\ArcToolbox\Toolboxes\Data Management Tools.tbx\AddField" Date="20180822" Time="113649">AddField \\os.uga.edu\onu-ocha\working\Process_Files\CODServices\Documentation\Templates\COD_XXX\Shapefiles\XXX_AdminBoundaries_ExportToShape.gdb\XXX_admbndt_adminUnitLookup LocTitle TEXT # # 50 # NULLABLE NON_REQUIRED #</Process><Process Name="Add Field (2)" ToolSource="c:\program files (x86)\arcgis\desktop10.1\ArcToolbox\Toolboxes\Data Management Tools.tbx\AddField" Date="20180822" Time="113650">AddField \\os.uga.edu\onu-ocha\working\Process_Files\CODServices\Documentation\Templates\COD_XXX\Shapefiles\XXX_AdminBoundaries_ExportToShape.gdb\XXX_admbndt_adminUnitLookup date DATE # # 100 # NULLABLE NON_REQUIRED #</Process><Process Name="Add Field (2)" ToolSource="c:\program files (x86)\arcgis\desktop10.1\ArcToolbox\Toolboxes\Data Management Tools.tbx\AddField" Date="20180822" Time="113651">AddField \\os.uga.edu\onu-ocha\working\Process_Files\CODServices\Documentation\Templates\COD_XXX\Shapefiles\XXX_AdminBoundaries_ExportToShape.gdb\XXX_admbndt_adminUnitLookup validOn DATE # # 100 # NULLABLE NON_REQUIRED #</Process><Process Name="Add Field (2)" ToolSource="c:\program files (x86)\arcgis\desktop10.1\ArcToolbox\Toolboxes\Data Management Tools.tbx\AddField" Date="20180822" Time="113652">AddField \\os.uga.edu\onu-ocha\working\Process_Files\CODServices\Documentation\Templates\COD_XXX\Shapefiles\XXX_AdminBoundaries_ExportToShape.gdb\XXX_admbndt_adminUnitLookup validTo DATE # # 100 # NULLABLE NON_REQUIRED #</Process><Process ToolSource="c:\program files (x86)\arcgis\desktop10.8\ArcToolbox\Toolboxes\Data Management Tools.tbx\CalculateField" Date="20230724" Time="165147">CalculateField NER_admbndt_adminUnitLookup validOn "7/25/2023" VB #</Process><Process ToolSource="c:\program files (x86)\arcgis\desktop10.8\ArcToolbox\Toolboxes\Data Management Tools.tbx\CalculateField" Date="20230724" Time="165229">CalculateField NER_admbndt_adminUnitLookup date "6/21/2023" VB #</Process><Process ToolSource="c:\program files (x86)\arcgis\desktop10.8\ArcToolbox\Toolboxes\Conversion Tools.tbx\TableToTable" Date="20230731" Time="144028">TableToTable K:\CODServices\COD_NER\Candidates\NER_AdminBoundaries_candidate.gdb\NER_admbndt_adminUnitLookup K:\CODServices\COD_NER\Shapefiles NER_admbndt_adminUnitLookup.dbf # "admNum "admNum" true true false 2 Short 0 0 ,First,#,K:\CODServices\COD_NER\Candidates\NER_AdminBoundaries_candidate.gdb\NER_admbndt_adminUnitLookup,admNum,-1,-1;admTitle "admTitle" true true false 50 Text 0 0 ,First,#,K:\CODServices\COD_NER\Candidates\NER_AdminBoundaries_candidate.gdb\NER_admbndt_adminUnitLookup,admTitle,-1,-1;LocTitle "LocTitle" true true false 50 Text 0 0 ,First,#,K:\CODServices\COD_NER\Candidates\NER_AdminBoundaries_candidate.gdb\NER_admbndt_adminUnitLookup,LocTitle,-1,-1;date "date" true true false 8 Date 0 0 ,First,#,K:\CODServices\COD_NER\Candidates\NER_AdminBoundaries_candidate.gdb\NER_admbndt_adminUnitLookup,date,-1,-1;validOn "validOn" true true false 8 Date 0 0 ,First,#,K:\CODServices\COD_NER\Candidates\NER_AdminBoundaries_candidate.gdb\NER_admbndt_adminUnitLookup,validOn,-1,-1;validTo "validTo" true true false 8 Date 0 0 ,First,#,K:\CODServices\COD_NER\Candidates\NER_AdminBoundaries_candidate.gdb\NER_admbndt_adminUnitLookup,validTo,-1,-1" #</Process></lineage><itemProps><itemName Sync="TRUE">NER_admbndt_adminUnitLookup</itemName><imsContentType Sync="TRUE">002</imsContentType><itemSize Sync="TRUE">0.000</itemSize><itemLocation><linkage Sync="TRUE">file://\\os.uga.edu\onu-ocha\working\Process_Files\CODServices\COD_NER\Shapefiles\NER_admbndt_adminUnitLookup.dbf</linkage><protocol Sync="TRUE">Local Area Network</protocol></itemLocation></itemProps></DataProperties><SyncDate>20230731</SyncDate><SyncTime>14402700</SyncTime><ModDate>20230731</ModDate><ModTime>14402700</ModTime></Esri><dataIdInfo><envirDesc Sync="TRUE"> Version 6.2 (Build 9200) ; Esri ArcGIS 10.8.1.14362</envirDesc><dataLang><languageCode value="eng" Sync="TRUE"></languageCode><countryCode value="USA" Sync="TRUE"></countryCode></dataLang><idCitation><resTitle Sync="TRUE">NER_admbndt_adminUnitLookup</resTitle><presForm><PresFormCd value="011" Sync="TRUE"></PresFormCd></presForm></idCitation><spatRpType><SpatRepTypCd value="003" Sync="TRUE"></SpatRepTypCd></spatRpType></dataIdInfo><mdLang><languageCode value="eng" Sync="TRUE"></languageCode><countryCode value="USA" Sync="TRUE"></countryCode></mdLang><distInfo><distFormat><formatName Sync="TRUE">dBASE Table</formatName></distFormat><distTranOps><transSize Sync="TRUE">0.000</transSize></distTranOps></distInfo><mdHrLv><ScopeCd value="007" Sync="TRUE"></ScopeCd></mdHrLv><mdHrLvName Sync="TRUE">dataset</mdHrLvName><eainfo><detailed Name="NER_admbndt_adminUnitLookup"><enttyp><enttypl Sync="TRUE">NER_admbndt_adminUnitLookup</enttypl><enttypt Sync="TRUE">Table</enttypt><enttypc Sync="TRUE">0</enttypc></enttyp><attr><attrlabl Sync="TRUE">OID</attrlabl><attalias Sync="TRUE">OID</attalias><attrtype Sync="TRUE">OID</attrtype><attwidth Sync="TRUE">4</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale><attrdef Sync="TRUE">Internal feature number.</attrdef><attrdefs Sync="TRUE">Esri</attrdefs><attrdomv><udom Sync="TRUE">Sequential unique whole numbers that are automatically generated.</udom></attrdomv></attr><attr><attrlabl Sync="TRUE">admNum</attrlabl><attalias Sync="TRUE">admNum</attalias><attrtype Sync="TRUE">Integer</attrtype><attwidth Sync="TRUE">5</attwidth><atprecis Sync="TRUE">5</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">admTitle</attrlabl><attalias Sync="TRUE">admTitle</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">50</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">LocTitle</attrlabl><attalias Sync="TRUE">LocTitle</attalias><attrtype Sync="TRUE">String</attrtype><attwidth Sync="TRUE">50</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">date</attrlabl><attalias Sync="TRUE">date</attalias><attrtype Sync="TRUE">Date</attrtype><attwidth Sync="TRUE">8</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">validOn</attrlabl><attalias Sync="TRUE">validOn</attalias><attrtype Sync="TRUE">Date</attrtype><attwidth Sync="TRUE">8</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr><attr><attrlabl Sync="TRUE">validTo</attrlabl><attalias Sync="TRUE">validTo</attalias><attrtype Sync="TRUE">Date</attrtype><attwidth Sync="TRUE">8</attwidth><atprecis Sync="TRUE">0</atprecis><attscale Sync="TRUE">0</attscale></attr></detailed></eainfo><mdDateSt Sync="TRUE">20230731</mdDateSt></metadata>