commit some error codes for merge study

you can learn how to merge the branches. And merge errors how should
you do.