back to working php version

merge error