resolve merge conflicts

Author: coolcode

.gitignore

@@ -3,4 +3,3 @@
 *.mp3
 docs
 .DS_Store
-data/.DS_Store

src/main.rs

@@ -466,6 +466,7 @@ fn ui(f: &mut Frame, player: &Player) {
         0.0
     };
 
+    
     let progress_label_text = if let Some(duration) = total {
         format!(" {}/{} ", Player::format_duration(elapsed), Player::format_duration(duration))
     } else {