Fix merge conflict
Use makeshift 0.10.0 (Mix support)