fixed load loop
fixed machine-loading merge conflict