Remove website.list_directories & .ours_or_theirs