search by author/singer
conflict
Merge branch 'master' of https://github.com/hqt/HopAmChuan
finish search