add property picurl
fix conflict