Stuck with merge conflicts? Delete last 2 commits & re-sync with main: `git reset --hard HEAD~2` then `git merge main`. Push changes with `--force` or `--force-with-lease` to avoid overwriting others' work.