diff --git a/jam-ui/package-lock.json b/jam-ui/package-lock.json
index acb45ee95..235df4715 100644
--- a/jam-ui/package-lock.json
+++ b/jam-ui/package-lock.json
@@ -9386,6 +9386,8 @@
     },
     "filestack-js": {
       "version": "3.32.3",
+      "resolved": "https://registry.npmjs.org/filestack-js/-/filestack-js-3.32.3.tgz",
+      "integrity": "sha512-bEQe3Cbc+jmGwTX3vx0985igDLabODaKbfgILpustZfaVgir3Wuaz35UJWvZbI/bPbJQ7+HON5wKzq7PGXCRUg==",
       "requires": {
         "@babel/runtime": "^7.8.4",
         "@filestack/loader": "^1.0.9",
diff --git a/jam-ui/src/components/dashboard/JKDashboardMain.js b/jam-ui/src/components/dashboard/JKDashboardMain.js
index 4d12722fb..b9eb822e8 100644
--- a/jam-ui/src/components/dashboard/JKDashboardMain.js
+++ b/jam-ui/src/components/dashboard/JKDashboardMain.js
@@ -1,5 +1,5 @@
 import React, { useContext, useEffect, useRef, useState } from 'react';
-import { Switch, Redirect } from 'react-router-dom';
+import { Switch, Redirect, Route } from 'react-router-dom';
 import PrivateRoute from '../../helpers/privateRoute';
 
 import NavbarTop from '../navbar/JKNavbarTop';
@@ -302,6 +302,11 @@ function JKDashboardMain() {
           <PrivateRoute path="/affiliate/signups" component={JKAffiliateSignups} />
           <PrivateRoute path="/affiliate/earnings" component={JKAffiliateEarnings} />
           <PrivateRoute path="/affiliate/agreement" component={JKAffiliateAgreement} />
+<<<<<<< HEAD
+=======
+          <Route path="/jamtracks/:artist/:song_slug" component={JKJamTracksLanding} />
+          <Route path="/jamtracks/:artist" component={JKJamTracksLanding} />
+>>>>>>> 31d12b7ef (pause)
           <PrivateRoute path="/jamtracks" component={JKJamTracksFilter} />
           <PrivateRoute path="/jamtrack/:id" component={JKJamTrackShow} />
           <PrivateRoute path="/jamtracks" component={JKJamTracksFilter} />