added merged version