Fixed merge
Added finish and restart