diff --git a/artists.go b/artists.go
index 0323d55..d5d9800 100644
--- a/artists.go
+++ b/artists.go
@@ -34,7 +34,11 @@ type Artist struct {
 	Members        []Member `json:"members"`
 }
 
+<<<<<<< HEAD
 // ArtistReleases ...
+=======
+// Artistreleases ...
+>>>>>>> efff71f46e36d0fd1868f4abe3efd8c82e32386f
 type ArtistReleases struct {
 	Paginastion Page            `json:"pagination"`
 	Releases    []ReleaseSource `json:"releases"`