edit gallery and upload
try to resolve conflict