almost time
merge