* Fix merge test for __DOLT_1__
* tree.ThreeWayMerge always calls callback when key collision occurs
* add keyless support for new format merge and other merge related tables
* newline of doom
* unskip more bats
* empty
* skip blame.bats and remotes-aws.bats