Simpler Merge, with tests