remove flash
starts admin block
fix merge