CALL DOLT_MERGE now returns fast_forward and conflicts status columns (#3564)

* CALL DOLT_MERGE now returns fast_forward and conflicts columns

* fix tests

* fix sql integration tests

* fix sql-merge.bats

* pr comment

integration-tests/mysql-client-tests/python/sqlalchemy-test.py

@@ -20,7 +20,7 @@ QUERY_RESPONSE = [
     {"insert into test (pk, `value`) values (1,1)": []},
     {"select dolt_commit('-a', '-m', 'my commit2')": [('',)]},
     {"select dolt_checkout('main')": [(0,)]},
-    {"select dolt_merge('mybranch')": [(1,)]},
+    {"select dolt_merge('mybranch')": [(0,)]},
     {"select COUNT(*) FROM dolt_log": [(3,)]},
 ]