merge restart and bug fix