git conflict problems
Genre Playback works now
Merge remote-tracking branch 'origin/master'