// to check the diff for conflict code git diff section/table/component.jsx // checkout the file if its resolved and done git checkout section/table/component.jsx