add php doc block
merge conflict