fix merge conflict in Reloder