Fix rebase conflict
Fix update process