Remove other files than can couse conflicts