commit a conflict line by YaoGit