restyle gallery magic_box
clean
fix merge