working upload, with conflicts resolved