rm unnecessary files
merge conflict