diff --git a/codeigniter/application/models/Model_music.php b/codeigniter/application/models/Model_music.php
index 9c26d73..e57b388 100644
--- a/codeigniter/application/models/Model_music.php
+++ b/codeigniter/application/models/Model_music.php
@@ -17,7 +17,7 @@ class Model_music extends CI_Model {
         return $query->result();
     }
 
-<<<<<<< HEAD
+
     public function getArtistes(){
         $query = $this->db->query(
             "SELECT artist.id AS artistId, artist.name AS artistName, album.name AS albumName, album.id AS albumId, album.year, cover.jpeg
@@ -71,36 +71,9 @@ class Model_music extends CI_Model {
             JOIN song ON track.songId = song.id
             WHERE album.id = ?
             ORDER BY track.diskNumber, track.number",
-=======
-	public function getArtistes(){
-		$query = $this->db->query(
-			"SELECT artist.id AS artistId, artist.name AS artistName, album.name AS albumName, album.year, cover.jpeg
-			FROM album
-			INNER JOIN artist ON album.artistId = artist.id
-			JOIN cover ON cover.id = album.coverId
-			GROUP BY artist.name, album.year
-			"
-		);
-		
-		return $query->result();
-	}
-
-	public function getTracksByAlbumId($albumId){
-        $query = $this->db->query(
-            "SELECT track.number, track.duration, song.name as songName 
-            FROM track 
-            JOIN album ON album.id = track.albumid
-            JOIN artist ON artist.id = album.artistId
-            JOIN song ON song.id = track.songId
-            WHERE track.albumId = ?
-			ORDER BY track.number",
->>>>>>> 1bd8d93ce58f04d7fc10d62db226dd012b1f7560
-            array($albumId)
-        );
+            array($albumId) );
         return $query->result();
     }
-<<<<<<< HEAD
-=======
 
     public function get_tri_Albums($Ctri){
         	$query = $this->db->query(
@@ -127,5 +100,5 @@ class Model_music extends CI_Model {
         $query = $this->db->get();
         return $query->result();
     }
->>>>>>> 1bd8d93ce58f04d7fc10d62db226dd012b1f7560
+
 }
diff --git a/codeigniter/application/views/album_info.php b/codeigniter/application/views/album_info.php
deleted file mode 100644
index e35a64c..0000000
--- a/codeigniter/application/views/album_info.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<h5>Détail de l'Album :</h5>
-<section class="track-list">
-<?php
-if(!empty($tracks)) {
-    foreach($tracks as $track){
-        echo "<div><article>";
-        echo "<header class='track-id'>Id : {$track->number}</header>";
-        echo "<div class='track-name'>Nom  : {$track->songName}</div>";
-        echo "<footer class='track_time'>Durée (en secondes) : {$track->duration}</footer>";
-        echo "</article></div>";
-    }
-} else {
-    echo "<p>Aucune piste trouvée pour cet album.</p>";
-}
-?>
-</section>
diff --git a/codeigniter/application/views/album_musics.php b/codeigniter/application/views/album_musics.php
index f9cde1c..142b561 100644
--- a/codeigniter/application/views/album_musics.php
+++ b/codeigniter/application/views/album_musics.php
@@ -5,8 +5,9 @@ foreach ($musics as $music) {
     
     echo "<div><article>";
     echo "<ul>";
-    echo "<li>Durée: {$music->trackDuration} secondes</li>";
     echo "<li>$music->songName</li>";
+    echo "<li>Durée: {$music->trackDuration} secondes</li>";
+    
     echo "</ul>";
     echo "</article></div>";
 }