merging
removing testing generated files