resolved conflicts getting php undefined idex errors