Resolve errors caused by conflict handling#721

genedna merged 2 commits into

gitmono-dev:maingitmono-dev/mega:mainfrom

Hou-Xiaoxuan:fix_diffHou-Xiaoxuan/mega:fix_diffCopy head branch name to clipboard