fix merge config bug. use mix instead.
Merge branch 'master' of https://github.com/songxc/sideNav