Fixing issues with merging.
Fixing broken tests.