Resolve merge conflicts in favor of remote, keep new models (Claude 4, GPT-5.2, Gemini 3) b82fac7 Arslan1997 commited on Jan 16