conflict
merge conflict ?
fuck
Merge branch 'master' of github.com:Eygle/wmp
Merge branch 'master' of github.com:Eygle/wmp
correction xml user