merge from stw