better picture upload
resolve merge conflict