not exactly TDDed, but got merge working. Now for some tests