diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..51c4d4c6
Binary files /dev/null and b/.DS_Store differ
diff --git a/.github/ISSUE_TEMPLATE/bcs25.md b/.github/ISSUE_TEMPLATE/bcs25.md
deleted file mode 100644
index 51785f76..00000000
--- a/.github/ISSUE_TEMPLATE/bcs25.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: bcs25
-about: Describe this issue template's purpose here.
-title: ''
-labels: ''
-assignees: ''
-
----
-
-
diff --git a/.github/ISSUE_TEMPLATE/complete-list.md b/.github/ISSUE_TEMPLATE/complete-list.md
deleted file mode 100644
index 5ccd425b..00000000
--- a/.github/ISSUE_TEMPLATE/complete-list.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Complete List
-about: Sending to upstream Repo
-title: Use UCID
-labels: Complete List
-assignees: ''
-
----
-
-
diff --git a/.github/ISSUE_TEMPLATE/completed-lists.md b/.github/ISSUE_TEMPLATE/completed-lists.md
deleted file mode 100644
index e7796b43..00000000
--- a/.github/ISSUE_TEMPLATE/completed-lists.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Completed Lists
-about: This is for your master pull request to merge your master into this repo.
-title: Put your UCID as the title (replace this text)
-
-labels: ''
-
-
-You need to make a pull request and add the link to the pull request to this issue when you submit.  
-
-PULL REQUEST LINK:
-
-UCID:
diff --git a/.github/ISSUE_TEMPLATE/master-list.md b/.github/ISSUE_TEMPLATE/master-list.md
deleted file mode 100644
index c222948d..00000000
--- a/.github/ISSUE_TEMPLATE/master-list.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Master List
-about: Describe this issue template's purpose here.
-title: ''
-labels: Master List
-assignees: ''
-
----
-
-This is the master list for the ideas
diff --git a/.github/ISSUE_TEMPLATE/master-lists.md b/.github/ISSUE_TEMPLATE/master-lists.md
new file mode 100644
index 00000000..ac630d5d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/master-lists.md
@@ -0,0 +1,18 @@
+---
+<<<<<<<< HEAD:.github/ISSUE_TEMPLATE/master-pull-request.md
+name: Master Pull Request
+<<<<<<< HEAD
+========
+name: Master Lists
+>>>>>>>> eed258c351a4965dc3039847ada58faa5cc4edbd:.github/ISSUE_TEMPLATE/master-lists.md
+about: This is for your master pull request to merge your master into this repo.
+=======
+about: This is for your master pull request to merge your master into this repo
+>>>>>>> 375e8517ffc338c3f4f9f06f4d7811218cfbe46c
+title: Put your UCID as the title (replace this text)
+labels: Master List
+assignees: ''
+
+---
+
+You need to make a pull request and add the link to the pull request to this issue when you submit.
diff --git a/.github/ISSUE_TEMPLATE/master-pull-request.md b/.github/ISSUE_TEMPLATE/master-pull-request.md
index 475bc47c..7a4c9b0a 100644
--- a/.github/ISSUE_TEMPLATE/master-pull-request.md
+++ b/.github/ISSUE_TEMPLATE/master-pull-request.md
@@ -1,11 +1,53 @@
 ---
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<<< HEAD:.github/ISSUE_TEMPLATE/master-pull-request.md
+name: Master Pull Request
+<<<<<<< HEAD
+<<<<<<< HEAD
+========
+name: Master Lists
+>>>>>>>> eed258c351a4965dc3039847ada58faa5cc4edbd:.github/ISSUE_TEMPLATE/master-lists.md
+about: This is for your master pull request to merge your master into this repo.
+=======
+about: This is for your master pull request to merge your master into this repo
+>>>>>>> 375e8517ffc338c3f4f9f06f4d7811218cfbe46c
+=======
+about: This is for your master pull request to merge your master into this repo
+=======
+about: This is for your master pull request to merge your master into this repo.
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6
+>>>>>>> 325284af1847c96b347063201ebc0d0ef105fd44
+title: Put your UCID as the title (replace this text)
+labels: Master List
+=======
+name: Master Pull Request
+about: This is for your master pull request to merge your master into this repo.
+title: Put your UCID as the title (replace this text)
+labels: compiled list
+>>>>>>> eed258c351a4965dc3039847ada58faa5cc4edbd
+=======
 name: Master Pull Request
-
-
 about: This is for your master pull request to merge your master into this repo.
-title: bcs25
+title: jk259
+labels: Submitting master branch
+>>>>>>> f4f4c33a292f0d792ab74f3e879a71ccf9197e9d
+assignees: ''
 
+---
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+You need to make a pull request and add the link to the pull request to this issue when you submit.
+=======
+=======
+>>>>>>> f4f4c33a292f0d792ab74f3e879a71ccf9197e9d
+You need to make a pull request and add the link to the pull request to this issue when you submit.  
 
-You need to make a pull request snd add the link to the pull request to the issue when you submit.
+PULL REQUEST LINK:
 
+UCID:
+<<<<<<< HEAD
+>>>>>>> eed258c351a4965dc3039847ada58faa5cc4edbd
+=======
+>>>>>>> f4f4c33a292f0d792ab74f3e879a71ccf9197e9d
diff --git a/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md
new file mode 100644
index 00000000..639f9a51
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/things-i-don-t-understand.md
@@ -0,0 +1,38 @@
+
+---
+<<<<<<< HEAD
+<<<<<<< HEAD
+name: Things I don't understand
+about: Please add one item that you don't understand
+title: "[Don't Understand]"
+labels: Don't Understand
+=======
+=======
+>>>>>>> 325284af1847c96b347063201ebc0d0ef105fd44
+name: Things I Don't Understand
+about: This is for adding issues that you don't understand
+title: ''
+<<<<<<< HEAD
+<<<<<<< HEAD
+labels: Things I Don't Know
+<<<<<<< HEAD
+>>>>>>> 375e8517ffc338c3f4f9f06f4d7811218cfbe46c
+=======
+labels: Don't Understand
+>>>>>>> eed258c351a4965dc3039847ada58faa5cc4edbd
+=======
+=======
+name: Things I don't understand
+about: Please add one item that you don't understand
+title: "[Don't Understand]"
+labels: Don't Understand
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6
+>>>>>>> 325284af1847c96b347063201ebc0d0ef105fd44
+=======
+labels: I don't know
+>>>>>>> f4f4c33a292f0d792ab74f3e879a71ccf9197e9d
+assignees: ''
+
+---
+
+I don't understand:
diff --git a/.github/ISSUE_TEMPLATE/things-i-know.md b/.github/ISSUE_TEMPLATE/things-i-know.md
index 3bcf609a..d9bc686b 100644
--- a/.github/ISSUE_TEMPLATE/things-i-know.md
+++ b/.github/ISSUE_TEMPLATE/things-i-know.md
@@ -2,9 +2,25 @@
 name: Things I know
 about: Add one item for each thing you learned keep to max of 255 characters
 title: "[Things I Learned]"
-labels: ''
+<<<<<<< HEAD
+<<<<<<< HEAD:.github/ISSUE_TEMPLATE/things-i-know.md
+<<<<<<< HEAD:.github/ISSUE_TEMPLATE/things-i-know.md
+labels: I know
+=======
+labels: Things I Know
+>>>>>>> 375e8517ffc338c3f4f9f06f4d7811218cfbe46c:.github/ISSUE_TEMPLATE/things-i-learned.md
+=======
+labels: Understand
+>>>>>>> eed258c351a4965dc3039847ada58faa5cc4edbd:.github/ISSUE_TEMPLATE/things-i-learned.md
+=======
+<<<<<<< HEAD:.github/ISSUE_TEMPLATE/things-i-learned.md
+labels: Things I Know
+=======
+labels: I know
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6:.github/ISSUE_TEMPLATE/things-i-know.md
+>>>>>>> 325284af1847c96b347063201ebc0d0ef105fd44
 assignees: ''
 
 ---
 
-Please add one item that you learned.  File new issues for each item that you learned.  Please keep the number of characters to no more than 255.
+I understand <fill in what you don't here>
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/things-we-understand.md b/.github/ISSUE_TEMPLATE/things-i-learned.md
similarity index 73%
rename from .github/ISSUE_TEMPLATE/things-we-understand.md
rename to .github/ISSUE_TEMPLATE/things-i-learned.md
index ac9b6d60..ed830519 100644
--- a/.github/ISSUE_TEMPLATE/things-we-understand.md
+++ b/.github/ISSUE_TEMPLATE/things-i-learned.md
@@ -1,8 +1,8 @@
 ---
-name: Things we understand
+name: Things I learned
 about: Add one item for each thing you learned keep to max of 255 characters
-title: "[Things we understand]"
-labels: Thing we understand
+title: "[Things I Learned]"
+labels: I know
 assignees: ''
 
 ---
diff --git a/.github/ISSUE_TEMPLATE/things-i-want-to-know.md b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md
new file mode 100644
index 00000000..3dc6f135
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/things-i-want-to-know.md
@@ -0,0 +1,47 @@
+
+name: Things I want to know
+about: Describe this issue template's purpose here.
+<<<<<<< HEAD
+<<<<<<< HEAD
+title: ''
+labels: Want to Know
+=======
+=======
+>>>>>>> 325284af1847c96b347063201ebc0d0ef105fd44
+title: 'Thing I want to know: <file in title> [Thing I want to Knows]'
+<<<<<<< HEAD
+<<<<<<< HEAD
+labels: Things I Want To Know
+<<<<<<< HEAD
+>>>>>>> 375e8517ffc338c3f4f9f06f4d7811218cfbe46c
+=======
+=======
+title: ''
+labels: Want to Know
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6
+>>>>>>> 325284af1847c96b347063201ebc0d0ef105fd44
+=======
+labels: I want to know
+>>>>>>> f4f4c33a292f0d792ab74f3e879a71ccf9197e9d
+assignees: ''
+
+---
+
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+=======
+Please describe what you want to know in less than 255 characters.
+>>>>>>> 375e8517ffc338c3f4f9f06f4d7811218cfbe46c
+=======
+labels: Want to learn
+assignees: ''
+
+I want to know <fill in what you don't here>
+>>>>>>> eed258c351a4965dc3039847ada58faa5cc4edbd
+=======
+Please describe what you want to know in less than 255 characters.
+=======
+
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6
+>>>>>>> 325284af1847c96b347063201ebc0d0ef105fd44
diff --git a/.github/ISSUE_TEMPLATE/things-we-don-t-understand.md b/.github/ISSUE_TEMPLATE/things-we-don-t-understand.md
deleted file mode 100644
index 60a3fea9..00000000
--- a/.github/ISSUE_TEMPLATE/things-we-don-t-understand.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Things we don't understand
-about: This is for adding issues that you don't understand
-title: ''
-labels: ''
-assignees: ''
-
----
-
-I don't understand <fill in what you don't here>
diff --git a/.github/ISSUE_TEMPLATE/things-we-want-to-know-next.md b/.github/ISSUE_TEMPLATE/things-we-want-to-know-next.md
deleted file mode 100644
index 97638fe3..00000000
--- a/.github/ISSUE_TEMPLATE/things-we-want-to-know-next.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Things we want to know next
-about: Describe this issue template's purpose here.
-title: 'Thing we want to know: <file in title> [Thing we want to Knows]'
-labels: Thing we want to know next
-assignees: ''
-
----
-
-Please describe what you want to know in less than 255 characters.
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..26d33521
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml
new file mode 100644
index 00000000..ec3902bc
--- /dev/null
+++ b/.idea/dbnavigator.xml
@@ -0,0 +1,410 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DBNavigator.Project.DataEditorManager">
+    <record-view-column-sorting-type value="BY_INDEX" />
+    <value-preview-text-wrapping value="true" />
+    <value-preview-pinned value="false" />
+  </component>
+  <component name="DBNavigator.Project.DatabaseEditorStateManager">
+    <last-used-providers />
+  </component>
+  <component name="DBNavigator.Project.DatabaseFileManager">
+    <open-files />
+  </component>
+  <component name="DBNavigator.Project.Settings">
+    <connections />
+    <browser-settings>
+      <general>
+        <display-mode value="TABBED" />
+        <navigation-history-size value="100" />
+        <show-object-details value="false" />
+      </general>
+      <filters>
+        <object-type-filter>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="true" />
+          <object-type name="ROLE" enabled="true" />
+          <object-type name="PRIVILEGE" enabled="true" />
+          <object-type name="CHARSET" enabled="true" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED_VIEW" enabled="true" />
+          <object-type name="NESTED_TABLE" enabled="true" />
+          <object-type name="COLUMN" enabled="true" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET_TRIGGER" enabled="true" />
+          <object-type name="DATABASE_TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="true" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="TYPE_ATTRIBUTE" enabled="true" />
+          <object-type name="ARGUMENT" enabled="true" />
+          <object-type name="DIMENSION" enabled="true" />
+          <object-type name="CLUSTER" enabled="true" />
+          <object-type name="DBLINK" enabled="true" />
+        </object-type-filter>
+      </filters>
+      <sorting>
+        <object-type name="COLUMN" sorting-type="NAME" />
+        <object-type name="FUNCTION" sorting-type="NAME" />
+        <object-type name="PROCEDURE" sorting-type="NAME" />
+        <object-type name="ARGUMENT" sorting-type="POSITION" />
+        <object-type name="TYPE ATTRIBUTE" sorting-type="POSITION" />
+      </sorting>
+      <default-editors>
+        <object-type name="VIEW" editor-type="SELECTION" />
+        <object-type name="PACKAGE" editor-type="SELECTION" />
+        <object-type name="TYPE" editor-type="SELECTION" />
+      </default-editors>
+    </browser-settings>
+    <navigation-settings>
+      <lookup-filters>
+        <lookup-objects>
+          <object-type name="SCHEMA" enabled="true" />
+          <object-type name="USER" enabled="false" />
+          <object-type name="ROLE" enabled="false" />
+          <object-type name="PRIVILEGE" enabled="false" />
+          <object-type name="CHARSET" enabled="false" />
+          <object-type name="TABLE" enabled="true" />
+          <object-type name="VIEW" enabled="true" />
+          <object-type name="MATERIALIZED VIEW" enabled="true" />
+          <object-type name="INDEX" enabled="true" />
+          <object-type name="CONSTRAINT" enabled="true" />
+          <object-type name="DATASET TRIGGER" enabled="true" />
+          <object-type name="DATABASE TRIGGER" enabled="true" />
+          <object-type name="SYNONYM" enabled="false" />
+          <object-type name="SEQUENCE" enabled="true" />
+          <object-type name="PROCEDURE" enabled="true" />
+          <object-type name="FUNCTION" enabled="true" />
+          <object-type name="PACKAGE" enabled="true" />
+          <object-type name="TYPE" enabled="true" />
+          <object-type name="DIMENSION" enabled="false" />
+          <object-type name="CLUSTER" enabled="false" />
+          <object-type name="DBLINK" enabled="true" />
+        </lookup-objects>
+        <force-database-load value="false" />
+        <prompt-connection-selection value="true" />
+        <prompt-schema-selection value="true" />
+      </lookup-filters>
+    </navigation-settings>
+    <dataset-grid-settings>
+      <general>
+        <enable-zooming value="true" />
+        <enable-column-tooltip value="true" />
+      </general>
+      <sorting>
+        <nulls-first value="true" />
+        <max-sorting-columns value="4" />
+      </sorting>
+      <audit-columns>
+        <column-names value="" />
+        <visible value="true" />
+        <editable value="false" />
+      </audit-columns>
+    </dataset-grid-settings>
+    <dataset-editor-settings>
+      <text-editor-popup>
+        <active value="false" />
+        <active-if-empty value="false" />
+        <data-length-threshold value="100" />
+        <popup-delay value="1000" />
+      </text-editor-popup>
+      <values-actions-popup>
+        <show-popup-button value="true" />
+        <element-count-threshold value="1000" />
+        <data-length-threshold value="250" />
+      </values-actions-popup>
+      <general>
+        <fetch-block-size value="100" />
+        <fetch-timeout value="30" />
+        <trim-whitespaces value="true" />
+        <convert-empty-strings-to-null value="true" />
+        <select-content-on-cell-edit value="true" />
+        <large-value-preview-active value="true" />
+      </general>
+      <filters>
+        <prompt-filter-dialog value="true" />
+        <default-filter-type value="BASIC" />
+      </filters>
+      <qualified-text-editor text-length-threshold="300">
+        <content-types>
+          <content-type name="Text" enabled="true" />
+          <content-type name="Properties" enabled="true" />
+          <content-type name="XML" enabled="true" />
+          <content-type name="DTD" enabled="true" />
+          <content-type name="HTML" enabled="true" />
+          <content-type name="XHTML" enabled="true" />
+          <content-type name="SQL" enabled="true" />
+          <content-type name="PL/SQL" enabled="true" />
+          <content-type name="JSON" enabled="true" />
+          <content-type name="JSON5" enabled="true" />
+          <content-type name="YAML" enabled="true" />
+        </content-types>
+      </qualified-text-editor>
+      <record-navigation>
+        <navigation-target value="VIEWER" />
+      </record-navigation>
+    </dataset-editor-settings>
+    <code-editor-settings>
+      <general>
+        <show-object-navigation-gutter value="false" />
+        <show-spec-declaration-navigation-gutter value="true" />
+        <enable-spellchecking value="true" />
+        <enable-reference-spellchecking value="false" />
+      </general>
+      <confirmations>
+        <save-changes value="false" />
+        <revert-changes value="true" />
+      </confirmations>
+    </code-editor-settings>
+    <code-completion-settings>
+      <filters>
+        <basic-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="false" />
+            <filter-element type="OBJECT" id="view" selected="false" />
+            <filter-element type="OBJECT" id="materialized view" selected="false" />
+            <filter-element type="OBJECT" id="index" selected="false" />
+            <filter-element type="OBJECT" id="constraint" selected="false" />
+            <filter-element type="OBJECT" id="trigger" selected="false" />
+            <filter-element type="OBJECT" id="synonym" selected="false" />
+            <filter-element type="OBJECT" id="sequence" selected="false" />
+            <filter-element type="OBJECT" id="procedure" selected="false" />
+            <filter-element type="OBJECT" id="function" selected="false" />
+            <filter-element type="OBJECT" id="package" selected="false" />
+            <filter-element type="OBJECT" id="type" selected="false" />
+            <filter-element type="OBJECT" id="dimension" selected="false" />
+            <filter-element type="OBJECT" id="cluster" selected="false" />
+            <filter-element type="OBJECT" id="dblink" selected="false" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </basic-filter>
+        <extended-filter>
+          <filter-element type="RESERVED_WORD" id="keyword" selected="true" />
+          <filter-element type="RESERVED_WORD" id="function" selected="true" />
+          <filter-element type="RESERVED_WORD" id="parameter" selected="true" />
+          <filter-element type="RESERVED_WORD" id="datatype" selected="true" />
+          <filter-element type="RESERVED_WORD" id="exception" selected="true" />
+          <filter-element type="OBJECT" id="schema" selected="true" />
+          <filter-element type="OBJECT" id="user" selected="true" />
+          <filter-element type="OBJECT" id="role" selected="true" />
+          <filter-element type="OBJECT" id="privilege" selected="true" />
+          <user-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </user-schema>
+          <public-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </public-schema>
+          <any-schema>
+            <filter-element type="OBJECT" id="table" selected="true" />
+            <filter-element type="OBJECT" id="view" selected="true" />
+            <filter-element type="OBJECT" id="materialized view" selected="true" />
+            <filter-element type="OBJECT" id="index" selected="true" />
+            <filter-element type="OBJECT" id="constraint" selected="true" />
+            <filter-element type="OBJECT" id="trigger" selected="true" />
+            <filter-element type="OBJECT" id="synonym" selected="true" />
+            <filter-element type="OBJECT" id="sequence" selected="true" />
+            <filter-element type="OBJECT" id="procedure" selected="true" />
+            <filter-element type="OBJECT" id="function" selected="true" />
+            <filter-element type="OBJECT" id="package" selected="true" />
+            <filter-element type="OBJECT" id="type" selected="true" />
+            <filter-element type="OBJECT" id="dimension" selected="true" />
+            <filter-element type="OBJECT" id="cluster" selected="true" />
+            <filter-element type="OBJECT" id="dblink" selected="true" />
+          </any-schema>
+        </extended-filter>
+      </filters>
+      <sorting enabled="true">
+        <sorting-element type="RESERVED_WORD" id="keyword" />
+        <sorting-element type="RESERVED_WORD" id="datatype" />
+        <sorting-element type="OBJECT" id="column" />
+        <sorting-element type="OBJECT" id="table" />
+        <sorting-element type="OBJECT" id="view" />
+        <sorting-element type="OBJECT" id="materialized view" />
+        <sorting-element type="OBJECT" id="index" />
+        <sorting-element type="OBJECT" id="constraint" />
+        <sorting-element type="OBJECT" id="trigger" />
+        <sorting-element type="OBJECT" id="synonym" />
+        <sorting-element type="OBJECT" id="sequence" />
+        <sorting-element type="OBJECT" id="procedure" />
+        <sorting-element type="OBJECT" id="function" />
+        <sorting-element type="OBJECT" id="package" />
+        <sorting-element type="OBJECT" id="type" />
+        <sorting-element type="OBJECT" id="dimension" />
+        <sorting-element type="OBJECT" id="cluster" />
+        <sorting-element type="OBJECT" id="dblink" />
+        <sorting-element type="OBJECT" id="schema" />
+        <sorting-element type="OBJECT" id="role" />
+        <sorting-element type="OBJECT" id="user" />
+        <sorting-element type="RESERVED_WORD" id="function" />
+        <sorting-element type="RESERVED_WORD" id="parameter" />
+      </sorting>
+      <format>
+        <enforce-code-style-case value="true" />
+      </format>
+    </code-completion-settings>
+    <execution-engine-settings>
+      <statement-execution>
+        <fetch-block-size value="100" />
+        <execution-timeout value="20" />
+        <debug-execution-timeout value="600" />
+        <focus-result value="false" />
+        <prompt-execution value="false" />
+      </statement-execution>
+      <script-execution>
+        <command-line-interfaces />
+        <execution-timeout value="300" />
+      </script-execution>
+      <method-execution>
+        <execution-timeout value="30" />
+        <debug-execution-timeout value="600" />
+        <parameter-history-size value="10" />
+      </method-execution>
+    </execution-engine-settings>
+    <operation-settings>
+      <transactions>
+        <uncommitted-changes>
+          <on-project-close value="ASK" />
+          <on-disconnect value="ASK" />
+          <on-autocommit-toggle value="ASK" />
+        </uncommitted-changes>
+        <multiple-uncommitted-changes>
+          <on-commit value="ASK" />
+          <on-rollback value="ASK" />
+        </multiple-uncommitted-changes>
+      </transactions>
+      <session-browser>
+        <disconnect-session value="ASK" />
+        <kill-session value="ASK" />
+        <reload-on-filter-change value="false" />
+      </session-browser>
+      <compiler>
+        <compile-type value="KEEP" />
+        <compile-dependencies value="ASK" />
+        <always-show-controls value="false" />
+      </compiler>
+      <debugger>
+        <debugger-type value="JDBC" />
+        <use-generic-runners value="true" />
+      </debugger>
+    </operation-settings>
+    <ddl-file-settings>
+      <extensions>
+        <mapping file-type-id="VIEW" extensions="vw" />
+        <mapping file-type-id="TRIGGER" extensions="trg" />
+        <mapping file-type-id="PROCEDURE" extensions="prc" />
+        <mapping file-type-id="FUNCTION" extensions="fnc" />
+        <mapping file-type-id="PACKAGE" extensions="pkg" />
+        <mapping file-type-id="PACKAGE_SPEC" extensions="pks" />
+        <mapping file-type-id="PACKAGE_BODY" extensions="pkb" />
+        <mapping file-type-id="TYPE" extensions="tpe" />
+        <mapping file-type-id="TYPE_SPEC" extensions="tps" />
+        <mapping file-type-id="TYPE_BODY" extensions="tpb" />
+      </extensions>
+      <general>
+        <lookup-ddl-files value="true" />
+        <create-ddl-files value="false" />
+        <synchronize-ddl-files value="true" />
+        <use-qualified-names value="false" />
+        <make-scripts-rerunnable value="true" />
+      </general>
+    </ddl-file-settings>
+    <general-settings>
+      <regional-settings>
+        <date-format value="MEDIUM" />
+        <number-format value="UNGROUPED" />
+        <locale value="SYSTEM_DEFAULT" />
+        <use-custom-formats value="false" />
+      </regional-settings>
+      <environment>
+        <environment-types>
+          <environment-type id="development" name="Development" description="Development environment" color="-2430209/-12296320" readonly-code="false" readonly-data="false" />
+          <environment-type id="integration" name="Integration" description="Integration environment" color="-2621494/-12163514" readonly-code="true" readonly-data="false" />
+          <environment-type id="production" name="Production" description="Productive environment" color="-11574/-10271420" readonly-code="true" readonly-data="true" />
+          <environment-type id="other" name="Other" description="" color="-1576/-10724543" readonly-code="false" readonly-data="false" />
+        </environment-types>
+        <visibility-settings>
+          <connection-tabs value="true" />
+          <dialog-headers value="true" />
+          <object-editor-tabs value="true" />
+          <script-editor-tabs value="false" />
+          <execution-result-tabs value="true" />
+        </visibility-settings>
+      </environment>
+    </general-settings>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 00000000..105ce2da
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..08550103
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (project-management-github-activity)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..23c82d06
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/project-management-github-activity.iml" filepath="$PROJECT_DIR$/.idea/project-management-github-activity.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/project-management-github-activity.iml b/.idea/project-management-github-activity.iml
new file mode 100644
index 00000000..b23d8836
--- /dev/null
+++ b/.idea/project-management-github-activity.iml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="jdk" jdkName="Python 3.10 (project-management-github-activity)" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 23720273..8ab03c37 100644
--- a/README.md
+++ b/README.md
@@ -9,50 +9,40 @@ The purpose of this assignment is to practice collaborating using GIT/GitHub and
 2.  You will learn to merge pull requests and resolve merge conflicts
 3.  You will learn to manage a basic project using GitHub Project.
 
-### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned.  The number in the bracket next to each issue is the count, you should set your count at 1 for your issue.  We need the count of how many times the issue is mentioned, so that we can prioritize each issue.
+### Complete the Assignment By adding your issues to these 3 lists and count how many times each issue is mentioned.  The number in the bracket next to each issue is the count, you should set your count at 1 for your issue.  We need the count of how many times the issue is mentioned, so that we can prioritze each issue.
+## Put your items here
+### Things you understand so far
+1.  I understand how to push to github
+2.  github conflict
+3.  how to merge
+4.  How to merge things even better
+5.  I know how to use vim
+6.  I know how to use bash scripts
+### Things you don't understand about what we are doing
+1. I am lost on hows to pro-Docker
+2. I am lost on hows to pro-Linux
+3. I am lost on hows to setup my domain name with my Oracle account
+4. I am lost on hows pull for this assignment
+5. I am lost on how to config
+6. I am lost on what causes conflict
+### Things you want to know next
+1. setup domain name
+2. why tedious assignment
+3. I want to know how to resolve conflicts
 
 ### Your list should look like this:
 #### Things we understand**
-
-
-1.  git status [1]
-2.  git fetch [1] 
-3.  git checkout [1]
-4.  Docker Setup[4]
-5.  Linux command[1]
-6.  I learned Python Pytest[1]
-7.  Create new branch and merge within my own repo[1]
-8.  Cloning Repository[2]
-9.  Python is integrated into pycharm[1]
-10.  Pycharm and Github workflow and integration process[1]
-11.  Create new branch and merge within my own repo[1]
-
+1.  Python Print[1]
+2.  Linux Directory listing[2] 
+3.  Docker Installation[1]
 #### Things we don't understand
-1.  Clarity on who Merges a pull request [1]
-2.  Difference between Docker build  & Docker compose  [1] 
-3.  How docker pushes to dockerhub [1]
-4.  Git rebase Usage[1]
-5.  Git Stash Usage[1]
-6.  Git show Usage[1]
-7.  Undo specific git commit or git push[2]
-8.  Git Pull[2]
-9.  Docker Storage space limitation[2]
-10. dockerization[1]
-11. Git Push[1]
-12. Teraform[1]
-12. Cloud deployment with Kubernetes[1]
-
-
+1. Git Stash[1]
+2. GIt pull[2]
+3. GIT status[1]
 #### Things we want to know next**
-1.  How to better work as a PM or as a subordinate [1]
-2.  Use Python program to write Hello World [1]
-3.  How Dockerhub pushes or uses resources against repos in scalable way [1] 
-4.  How to deploy a web app with a database on the cloud [1]
-5.  Cloud deployment with Kubernetes[3]
-6.  Teraform Usage[3]
-7.  Elastic Search Indexing[3]
-8. Security within our Github and Docker workflow[1]
-9. Linux Directory Listings[1]
+1.  Elastic Search Indexing [1]
+2.  Cloud deployment with Kubernetes[2]
+3.  Teraform[1]
 
 ## Prerequisite - YOU. MUST SETUP PRIVATE PUBLIC KEY AUTH WITH GITHUB OR YOU WILL GET ACCESS DENIED ERRORS WHEN YOU PUSH FROM THE TERMINAL
 Add your ssh public key to github - See video
@@ -121,3 +111,50 @@ Collaborating on GitHub:
 13.  update your local main branch with the changes from the merge by doing git pull origin main
 14. Repeat again, and again, and again
 
+<<<<<<< HEAD
+=======
+1. Add items to the list
+=======
+1. I know how to make ssh keys
+<<<<<<< HEAD
+>>>>>>> 2716e3e74f642aa96b78a25883d4471db75400fd
+=======
+2. I know personal domain use
+<<<<<<< HEAD
+>>>>>>> 515aa38a7113dc8aa753aa4d7bbf4b14fc3e326a
+=======
+3. I know how to make a personal token
+>>>>>>> 028a10787611c0b89a8972e44f171a76ac36db22
+### Things you don't understand about what we are doing / web development.
+1. Don't understand forking
+2. Don't Understand Oracle Cloud
+3. Don't understand the difference between cloning and forking
+### Things you want to know next
+<<<<<<< HEAD
+1. How to connect viewjs to elastic search
+2. This is something I want to know
+>>>>>>> f64d4009149766f89d55a555333912054e9062d6
+=======
+<<<<<<< HEAD
+### Joshua Kaisar's List:
+#### Things we understand**
+1. How to make a static website
+2. Git
+3. Agile
+4. Docker
+
+#### Things we don't understand
+1. Difference between Scrum and Kanban
+2. Terraform Automation
+3. Kubernetes
+
+#### Things we want to know next**
+1. Microsoft Azure
+2. AWS S3 Buckets
+>>>>>>> f4f4c33a292f0d792ab74f3e879a71ccf9197e9d
+=======
+1. More in depth SQL
+>>>>>>> 8b44ab78b09b81220e9d9c5d4970d14755c6eb13
+>>>>>>> 78a4abf81071b0d5e7b669da13dde65c901fbc12
+
+test
\ No newline at end of file