Fixed merging issues in mixins