diff --git a/.atom-build.yml b/.atom-build.yml
index 911e076..b231050 100644
--- a/.atom-build.yml
+++ b/.atom-build.yml
@@ -1 +1,5 @@
+<<<<<<< HEAD
 cmd: node main.js --dir ""D:\New Folder""
+=======
+cmd: node main.js --dir ""D:\New Folder""
+>>>>>>> 49581d68df3440aed7cba6ef41ed0c7d72aff6af
diff --git a/README.md b/README.md
index 49551cb..f84a7a0 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,8 @@
 # library-converter
 Converts music libraries to MP4
+
+Just run with library-converter.exe --dir "C:\your\music\library"
+it will create "C:\your\music\library AAC" and put everything there. none of your actual library is touched.
+only converts flac and wav files.
+
+requires ffmpeg. tested with git-2019-12-07-70e292b.