merge: finish tests
merge: finish tests

* new merge implementation fixes long standing regression

Netsend/mastersync,Netsend/mastersync,Netsend/persdb,Netsend/PerspectiveDB,Netsend/PerspectiveDB,Netsend/PerspectiveDB,Netsend/persdb,Netsend/mastersync,Netsend/persdb