fix
fix merge
t
add preview