fixing PHP syntax error from bad merge