merge branch mixin