Cursor - Community Forum
conflict_commit