fixes in merger