translate ./novice/git/03-conflict.md for the first time