Working on user mix creation
Fix merge conflict