remove namespace conflict
Merge branch 'master' of github.com:umich-flux/miflux