crono ok and fix some stuff
fix merge
fix container scroll