merge

fix auto reload