modefify exports
fix conflict
add loader