merge from daven