Unnecessary file deleted
merge fix