Fix leftover merge conflict markers in files#483

mrbadri merged 3 commits into

reactjs:mainreactjs/fa.react.dev:mainfrom

PouriaDamavandi:fix/merge-conflict-filesPouriaDamavandi/fa.react.dev:fix/merge-conflict-filesCopy head branch name to clipboard