code upload filename validity works
i think merge is fixed?