fixed merge results and unit tests