migrate git-conflict