merge from prev version