fixed merge, mixin error