ADD::remove conflit on drums
Merge pull request #8 from hukewei/zhuchunxiao/playviewconflit

ADD::remove conflit on drums