Cursor Agent
Resolve merge conflicts - keep enhanced versions with new data sources
794fc5a