assets fix
fix merge conflict