The rest of this step is the key part. Using the "ours" strategy ignores the actual changes that happened in step 2 but says they were merged anyway.