qiyi

@simonua in general, you shouldn't use any "merge" command. You should use "rebase" instead. I guess you merged other's commit into your commit and now it is contributed by two...