Fix bug mixing level
Merged master fixed conflict