init
add asset
fix conflict