merge fix
order the scripts