Fixes PHP errors caused by bad commit merge