ruby mixin
merge conflict