Revert "Fix: 'replace' is now 'conflict'"

This reverts commit 3d3bbf08a73de4eebe7ea938379f7e6ecb1e4df4.