fixed optimize_restarts
merged trivial conflict