merge from temp