restart from now
merge