removed old files from merge