changed timezone in php.ini
merge