Fixed conflict
-rw-r--r-- 1338 README.md
-rw-r--r-- 1128 neiasound.pro
drwxr-xr-x - src