Fixed merge issues

[Hydrocharged]

There was a merge bug that was preventing a few more tests from passing, which has been fixed on the Dolt side. Additionally, serialization of conflicts have been updated, and I didn't bump the version number since we don't have a release with conflict support, so it should be safe to do so. This also fixes a few additional bugs that were hidden behind the aforementioned merge bug.

Relies on:

• Fix table usage during merge dolt#9642

[github-actions]

	Main	PR
covering_index_scan_postgres	325.79/s	335.95/s	+3.1%
index_join_postgres	158.14/s	157.52/s	-0.4%
index_join_scan_postgres	189.34/s	189.51/s	0.0%
index_scan_postgres	12.59/s	12.51/s	-0.7%
oltp_point_select	2543.19/s	2514.48/s	-1.2%
oltp_read_only	1828.03/s	1809.62/s	-1.1%
select_random_points	118.78/s	117.83/s	-0.8%
select_random_ranges	132.43/s	129.67/s	-2.1%
table_scan_postgres	11.83/s	11.68/s	-1.3%
types_table_scan_postgres	5.55/s	5.48/s	-1.3%

[github-actions]

	Main	PR
Total	42090	42090
Successful	16722	16722
Failures	25368	25368
Partial Successes1	5545	5545

	Main	PR
Successful	39.7292%	39.7292%
Failures	60.2708%	60.2708%

Footnotes

1. These are tests that we're marking as Successful, however they do not match the expected output in some way. This is due to small differences, such as different wording on the error messages, or the column names being incorrect while the data itself is correct. ↩

[fulghum]

LGTM