merge from react