updated README for Ember 5.9

README.md

@@ -9,41 +9,13 @@ You will need the following things properly installed on your computer.
 - [Git](https://git-scm.com/)
 - [Node.js](https://nodejs.org/) (with npm)
 - [Ember CLI](https://cli.emberjs.com/release/)
-<<<<<<< HEAD
 - [PNPM](https://pnpm.io/installation)
 - [Web browser](https://browser-update.org/browsers.html)
-=======
-- [Google Chrome](https://google.com/chrome/)
->>>>>>> ee71d9b (v5.8.1...v5.9.0)
 
 ## Installation
 
 - `git clone <repository-url>` this repository
 - `cd remember-stuff`
-<<<<<<< HEAD
-- `pnpm install`
-
-## Running / Development
-
-- `pnpm start`
-- Visit your app at [http://localhost:4200](http://localhost:4200).
-- Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
-
-### Running Tests
-
-- `ember test` - run tests once in terminal
-- `ember t -s` - run tests continuously in a browser
-
-### Linting
-
-- `pnpm lint`
-- `pnpm lint:fix`
-
-### Building
-
-- `ember build` (development)
-- `ember build --environment=production` (production)
-=======
 - `npm install`
 
 ## Running / Development
@@ -70,15 +42,13 @@ Make use of the many generators for code, try `ember help generate` for more det
 
 - `npm exec ember build` (development)
 - `npm run build` (production)
->>>>>>> ee71d9b (v5.8.1...v5.9.0)
 
 ### Deploying
 
 Currently being built on [Netlify](https://mc-emberjs-remember-stuff.netlify.app). Re-deploys on pushes to master.
 
 ### Notable Dependencies
 
-<<<<<<< HEAD
 - [Ember CLI DotEnv](https://www.npmjs.com/package/ember-cli-dotenv)
 - [Ember CLI Head](https://www.npmjs.com/package/ember-cli-head)
 - [Ember CLI Sass](https://www.npmjs.com/package/ember-cli-sass)
@@ -94,10 +64,3 @@ Currently being built on [Netlify](https://mc-emberjs-remember-stuff.netlify.app
 - Pass new fields into `<Debug>` component in `app/templates/application.hbs`
 - Add those fields to `<GhUser>` component in `app/components/gh-user.hbs`
   - (Optional) Add new translations to `/translations/*` files
-=======
-- [ember.js](https://emberjs.com/)
-- [ember-cli](https://cli.emberjs.com/release/)
-- Development Browser Extensions
-  - [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
-  - [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
->>>>>>> ee71d9b (v5.8.1...v5.9.0)