Fixed g1 and g2 mute bug
Fixed conflicts