Create a conflict
Merge branch 'master' of https://github.com/xjguo/miam.git