add loader
merge