fixed conflict
Merge branch 'integration' into mux