Merge phpcan