remaining garbage from merge