removed some generated files
tried another merge