added a little bit
random begin
fix conflict
fix-wmix