merge upload button fix