即将离开稀土掘金，请注意账号财产安全
https://stackoverflow.com/questions/27417656/should-diff3-be-default-conflictstyle-on-git
