diff --git a/api/services/spotify.json b/api/services/spotify.json
index 5d4c9df..89df85c 100644
--- a/api/services/spotify.json
+++ b/api/services/spotify.json
@@ -69,8 +69,7 @@
 	],
 	"reactions": [
 		{
-<<<<<<< HEAD
-			"name": "PlayTrack",
+			"name": "Spotify_PlayTrack",
 			"description": {
 				"en": "Play a track",
 				"fr": "Joue une musique"
@@ -79,10 +78,6 @@
 				"en": "Play a track",
 				"fr": "Joue une musique"
 			},
-=======
-			"name": "Spotify_PlayTrack",
-			"description": "Play a track",
->>>>>>> 26566154676c8e279c3615522129e61b851c75a9
 			"params": [
 				{
 					"name": "artist",
@@ -139,8 +134,7 @@
 			"returns": []
 		},
 		{
-<<<<<<< HEAD
-			"name": "AddTrackToLibrary",
+			"name": "Spotify_AddTrackToLibrary",
 			"description": {
 				"en": "Add a track to library",
 				"fr": "Ajoute une musique à la librarie"
@@ -149,10 +143,6 @@
 				"en": "Add a song to library",
 				"fr": "Ajoute une musique à votre librarie"
 			},
-=======
-			"name": "Spotify_AddTrackToLibrary",
-			"description": "Add a track to library",
->>>>>>> 26566154676c8e279c3615522129e61b851c75a9
 			"params": [
 				{
 					"name": "artist",