diff --git a/db/manifest b/db/manifest
index 6b25b087c..f46d74380 100755
--- a/db/manifest
+++ b/db/manifest
@@ -229,7 +229,7 @@ deletable_recordings.sql
 jam_tracks.sql
 shopping_carts.sql
 recurly.sql
-add_track_resource_id.sql 
+add_track_resource_id.sql
 user_genres.sql
 user_online.sql
 icecast_source_changes.sql
diff --git a/web/app/assets/javascripts/jam_rest.js b/web/app/assets/javascripts/jam_rest.js
index 1be8d9bab..e0988bcf6 100644
--- a/web/app/assets/javascripts/jam_rest.js
+++ b/web/app/assets/javascripts/jam_rest.js
@@ -1540,12 +1540,9 @@
         this.updateBillingInfo = updateBillingInfo;
         this.placeOrder = placeOrder;
         this.searchMusicians = searchMusicians;
-<<<<<<< HEAD
         this.resendBandInvitation = resendBandInvitation;
-=======
         this.getMount = getMount;
         this.createSourceChange = createSourceChange;
->>>>>>> feature/broadcast_slow
 
         return this;
     };