+ added test for merge (currently still failing)

The merge provided in Analysis.java is an incorrect stub, a working merge is still missing.