deleted unnecessary files
merge conflict fixed