don't track any useless folder
solve conflicts