rewrite of last upload

fixing merge errors inside files