diff --git a/etc/media/mpd/mpd.conf b/etc/media/mpd/mpd.conf
index e557fac..00fea38 100644
--- a/etc/media/mpd/mpd.conf
+++ b/etc/media/mpd/mpd.conf
@@ -1,14 +1,10 @@
 # mpd.conf
 #
-<<<<<<< HEAD
-# Изменён: Вск 15 Сен 2013 18:30:00
-=======
-# Изменён: Чт 13 мар 2014 14:18:07
->>>>>>> 752b4da... V5: настройка mpd & ncmpcpp & mpdscribble
+# Изменён: Чт 13 мар 2014 15:45:18
 #
 
 #Директория с музыкой
-music_directory "/media/2TB/Музыка/"
+music_directory "/mnt/2TB/Музыка/"
 
 #Файл базы данных композиций
 db_file "~/.shellrc/var/mpd/mpd.db"
@@ -32,23 +28,20 @@ bind_to_address "localhost"
 port "6600"
 
 #Настройка звука
-#audio_output {
-#       type    "alsa"
-#       name    "Sound Card"
-#       options "dev=dmixer"
-#       device  "plug:dmix"
-#}
-
 audio_output {
-       type    "jack"
-       name    "Sound Card"
-<<<<<<< HEAD
-=======
-       device  "hw:1,0"
-       mixer_control "Master"
->>>>>>> 752b4da... V5: настройка mpd & ncmpcpp & mpdscribble
+        type    "alsa"
+        name    "Sound Card"
+        device  "hw:1,0"
+        mixer_control "Master"
 }
 
+#audio_output {
+#type    "jack"
+#name    "Sound Card"
+#device  "hw:1,0"
+#mixer_control "Master"
+#}
+
 # audio_output {
 # 	type "httpd"
 # 	name "MPD"
diff --git a/etc/media/ncmpcpp/config b/etc/media/ncmpcpp/config
index af62c95..85edf95 100644
--- a/etc/media/ncmpcpp/config
+++ b/etc/media/ncmpcpp/config
@@ -1,23 +1,13 @@
 # ncmpcpp
 #
-<<<<<<< HEAD
-# Изменён: Вс 25 авг 2013 01:08:52
-=======
-# Изменён: Чт 13 мар 2014 14:38:00
->>>>>>> 752b4da... V5: настройка mpd & ncmpcpp & mpdscribble
+# Изменён: Чт 13 мар 2014 15:43:32
 #
 
 #Общие настройки#{{{
 
-<<<<<<< HEAD
-mpd_music_dir			= "/media/2TB/Музыка/"
-mpd_connection_timeout		= "5"
-mpd_crossfade_time		= "0"
-=======
 mpd_music_dir = "/mnt/2TB/Музыка/"
 mpd_connection_timeout = "5"
 mpd_crossfade_time = "0"
->>>>>>> 752b4da... V5: настройка mpd & ncmpcpp & mpdscribble
 
 #Задержка между песнями
 playlist_disable_highlight_delay = "0"
@@ -26,15 +16,15 @@ playlist_disable_highlight_delay = "0"
 
 #Формат плейлиста#{{{
 
-song_list_format		= "{$5(%l)$9 }{%t}{%a - %y-%b}"
-song_library_format		= "{%n - }{%t}"
-media_library_album_format	= "{%a: }{%y - }%b"
-tag_editor_album_format		= "{(%y) }%b"
-browser_playlist_prefix		= "$7playlist$9 "
-selected_item_prefix		= "$5"
-selected_item_suffix		= "$9"
-song_window_title_format	= "{%a - %b}{%t}|{%f}"
-song_columns_list_format	= "(17)[green]{a} (3)[blue]{n} (24)[blue]{t} (5)[green]{y} (22)[green]{b} (23)[blue]{g} (4)[green]{C} (6)[blue]{l}"
+song_list_format = "{$5(%l)$9 }{%t}{%a - %y-%b}"
+song_library_format = "{%n - }{%t}"
+media_library_album_format = "{%a: }{%y - }%b"
+tag_editor_album_format = "{(%y) }%b"
+browser_playlist_prefix = "$7playlist$9 "
+selected_item_prefix = "$5"
+selected_item_suffix = "$9"
+song_window_title_format = "{%a - %b}{%t}|{%f}"
+song_columns_list_format = "(17)[green]{a} (3)[blue]{n} (24)[blue]{t} (5)[green]{y} (22)[green]{b} (23)[blue]{g} (4)[green]{C} (6)[blue]{l}"
 alternative_header_first_line_format  = "{%t}"
 alternative_header_second_line_format = "$7{%a} - $5{%b} $3{(%y)}"