fix: merge conflicts

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+#### Changes Made
+
+#### Potential Risks
+<!--- What can go wrong with this change? How will these changes affect adjacent code/features? How will we handle any adverse issues? --->
+
+#### Test Plan
+<!--- How do we know this PR does what it's supposed to do? How do we ensure that adjacent code/features are still working? How do we evaluate the performance implications of this PR?--->
+
+#### Checklist
+
+- [ ] I've increased test coverage
+- [ ] Since this is a public repository, I've checked I'm not publishing private data in the code, commit comments, or this PR.

.prettierignore

@@ -1,3 +1,4 @@
 *.hbs
 *.min.js
 *.min.css
+pull_request_template.md

CHANGELOG.md

@@ -1,3 +1,9 @@
+### [3.17.1](https://github.com/bee-queue/arena/compare/v3.17.0...v3.17.1) (2021-04-05)
+
+### Bug Fixes
+
+- fixes misplaced parameters ([4b98628](https://github.com/bee-queue/arena/commit/4b986281786be13d6c7dda89d24776298edbf6b2))
+
 ## [3.17.0](https://github.com/bee-queue/arena/compare/v3.16.0...v3.17.0) (2021-03-31)
 
 ### Features

README.md

@@ -159,7 +159,7 @@ const arena = Arena({
 router.use('/', arena);
 ```
 
-`Arena` takes two arguments. The first, `config`, is a plain object containing the [queue configuration](#usage). The second, `listenOpts`, is an object that can contain the following optional parameters:
+`Arena` takes two arguments. The first, `config`, is a plain object containing the [queue configuration and other optional parameters](#usage). The second, `listenOpts`, is an object that can contain the following optional parameters:
 
 - `port` - specify custom port to listen on (default: 4567)
 - `host` - specify custom ip to listen on (default: '0.0.0.0')
@@ -194,16 +194,16 @@ const arenaConfig = Arena({
       },
     },
   ],
+
+  // Optionally include your own stylesheet
+  customCssPath: 'https://example.com/custom-arena-styles.css'
 },
 {
   // Make the arena dashboard become available at {my-site.com}/arena.
   basePath: '/arena',
 
   // Let express handle the listening.
   disableListen: true,
-
-  // Optionally include your own stylesheet
-  customCssPath: 'https://example.com/custom-arena-styles.css'
 });
 
 // Make arena's resources (js/css deps) available at the base app route
@@ -238,16 +238,16 @@ const arenaConfig = Arena({
       },
     },
   ],
+
+  // Optionally include your own stylesheet
+  customCssPath: 'https://example.com/custom-arena-styles.css'
 },
 {
   // Make the arena dashboard become available at {my-site.com}/arena.
   basePath: '/arena',
 
   // Let express handle the listening.
   disableListen: true,
-
-  // Optionally include your own stylesheet
-  customCssPath: 'https://example.com/custom-arena-styles.css'
 });
 
 // Make arena's resources (js/css deps) available at the base app route

package.json

@@ -44,5 +44,5 @@
     "src"
   ],
   "repository": "https://github.com/bee-queue/arena.git",
-  "version": "3.17.0"
+  "version": "3.17.1"
 }