uhhh....

I haven't the foggiest why it thinks I'm asking you to merge in your own changes.

I apparently suck at git?

Anyways, this should just be a one-line change of the version of php.