Changed time to 50s
Fixed merge