Define a basic merge API, and a two-way tree merge strategy