deleted unnecessary files from merge