Merge pull request #2 from songxc/master

Auto merge by kpm server
Merge pull request #2 from kissygalleryteam/master

fix merge config bug. use mix instead.