Conflict Resolve
Conflict resolve
conflict resolve
conflict resolve
Revert "conflict resolve"

This reverts commit 4f17415571afb417998fdc962143c2d1ad9ba941.
Revert "conflict resolve"

This reverts commit d96c41607dbf8e5a6c19dd77aca39fb856a507a5.
Revert "Conflict resolve"

This reverts commit 92fbdeb5c7f687314176710914ba9241ace9f068.
Revert "Conflict Resolve"

This reverts commit b96c53c37637165b6d63b91de502294f196aaa88.
Revert "Final Refactor Commit"

This reverts commit 6369175c5a2e7c25c8ac9fdb0df639046d464539.
Revert "commit 2"

This reverts commit 2a0bcf3714cd374875704ea0e0dd3283050895d3.
Revert "Refactor using functions"

This reverts commit e8c036ad82c7d4d3beba2f2351c34b22f70c962d.
Revert "Revert "Refactor using functions""

This reverts commit 03eec134a8af755aca3606e7182bb64dd8afc15b.
Revert "Revert "commit 2""

This reverts commit 87d2f78818f484fe7ef23110f2a183f180807f84.
Revert "Revert "Final Refactor Commit""

This reverts commit 663cb03cefa43531f5184206122202d2ff89bacc.
New Refactor