removed old file from merge