图片 + 删除部分
Many Change
Resolve merge conflict
Commit merge