Refactor: Resolve merge conflicts

Resolve merge conflicts

Resolves: N/a
See also: N/a

README.md

@@ -64,15 +64,6 @@ required to complete them.
 
 ### Tier-3: Advanced Projects
 
-<<<<<<< HEAD
-| Name                                                 | Description                                 | Tier       |
-| ---------------------------------------------------- | ------------------------------------------- | ---------- |
-| [GitHub Timeline](./Projects/GitHub-Timeline-App.md) | Generate a timeline of a users GitHub Repos | 3-Advanced |
-| [Kudos Slackbot](./Projects/Kudos-Slackbot.md)       | Give recognition to a deserving peer        | 3-Advanced |
-| [Slack Archiver](./Projects/Slack-Archiver.md)       | Archive Slack Messages                      | 3-Advanced |
-| [Spell-It App](./Projects/SpellIt-App.md)            | A twist on the classic Speak N Spell game   | 3-Advanced |
-| [Survey App](./Projects/Survey-App.md)               | Define, conduct, and view a survey          | 3-Advanced |
-=======
 | Name                                                               | Description | Tier |
 | ------------------------------------------------------------------ |-------------|------|
 | [Battleship Game Engine](./Projects/Battleship-Game-Engine.md)     | Create a callable engine to play the Battleship game | 3-Advanced |
@@ -81,7 +72,6 @@ required to complete them.
 | [Slack Archiver](./Projects/Slack-Archiver.md)                     | Archive Slack Messages | 3-Advanced |
 | [Spell-It App](./Projects/SpellIt-App.md)                          | A twist on the classic Speak N Spell game | 3-Advanced |
 | [Survey App](./Projects/Survey-App.md)                             | Define, conduct, and view a survey | 3-Advanced |
->>>>>>> 7d230474489b2071179e6c0f57b02742bd47f17a
 
 ## Trello Collection Boards