fix the conflicts of the scripts