The change in 225c0dda80 (#5511) results in conflicts being immediately scanned and synced, while the test expects just one conflict on either side. Change it to expect the same conflict on both sides.
225c0dda80