fix day lenght
fix merge