Fix: 'replace' is now 'conflict'