update picUrl
fix conflict