Fix the order of update hooks after merge