Fix load

Conflict
Fix conflict