remove more conflict files
Merge branch 'master' of https://github.com/opiuman/rhythm
Merge branch 'master' of https://github.com/opiuman/rhythm