unnecessary file deleted
maintain the old code properly
conflict removed